Initial commit

src/main/java/com/gxwebsoft/common/system/entity/AccessKey.java

@@ -0,0 +1,55 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 访问凭证管理
+ *
+ * @author 科技小王子
+ * @since 2023-05-16 19:19:55
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "AccessKey对象", description = "访问凭证管理")
+@TableName("sys_access_key")
+public class AccessKey implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典项id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "字典id")
+    private String accessKey;
+
+    @ApiModelProperty(value = "字典项标识")
+    private String accessSecret;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Cache.java

@@ -0,0 +1,34 @@
+package com.gxwebsoft.common.system.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 缓存管理
+ *
+ * @author WebSoft
+ * @since 2022-11-19 13:54:27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Setting对象", description = "缓存管理")
+public class Cache implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "key")
+    private String key;
+
+    @ApiModelProperty(value = "设置内容（json格式）")
+    private String content;
+
+    @ApiModelProperty(value = "过期时间(秒)")
+    private Long expireTime;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Company.java

@@ -0,0 +1,141 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 企业信息
+ *
+ * @author 科技小王子
+ * @since 2023-05-27 14:57:34
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Company对象", description = "企业信息")
+@TableName("sys_company")
+public class Company implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "企业id")
+    @TableId(value = "company_id", type = IdType.AUTO)
+    private Integer companyId;
+
+    @ApiModelProperty(value = "企业简称")
+    private String shortName;
+
+    @ApiModelProperty(value = "企业全称")
+    private String companyName;
+
+    @ApiModelProperty(value = "企业标识")
+    private String companyCode;
+
+    @ApiModelProperty(value = "类型 10企业 20政府单位")
+    private Integer companyType;
+
+    @ApiModelProperty(value = "应用标识")
+    private String companyLogo;
+
+    @ApiModelProperty(value = "企业域名")
+    private String domain;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "发票抬头")
+    @TableField("Invoice_header")
+    private String invoiceHeader;
+
+    @ApiModelProperty(value = "服务开始时间")
+    private Date startTime;
+
+    @ApiModelProperty(value = "服务到期时间")
+    private Date expirationTime;
+
+    @ApiModelProperty(value = "应用版本 10体验版 20授权版 30旗舰版")
+    private Integer version;
+
+    @ApiModelProperty(value = "企业成员(当前)")
+    private Integer users;
+
+    @ApiModelProperty(value = "成员数量(上限)")
+    private Integer members;
+
+    @ApiModelProperty(value = "存储空间")
+    private Long storage;
+
+    @ApiModelProperty(value = "存储空间(上限)")
+    private Long storageMax;
+
+    @ApiModelProperty(value = "行业类型(父级)")
+    private String industryParent;
+
+    @ApiModelProperty(value = "行业类型(子级)")
+    private String industryChild;
+
+    @ApiModelProperty(value = "部门数量")
+    private Integer departments;
+
+    @ApiModelProperty(value = "所在国家")
+    private String country;
+
+    @ApiModelProperty(value = "所在省份")
+    private String province;
+
+    @ApiModelProperty(value = "所在城市")
+    private String city;
+
+    @ApiModelProperty(value = "所在辖区")
+    private String region;
+
+    @ApiModelProperty(value = "街道地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否实名认证")
+    private Integer authentication;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "是否默认企业主体")
+    private Boolean authoritative;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "租户名称")
+    @TableField(exist = false)
+    private String tenantName;
+
+    @ApiModelProperty(value = "租户编号")
+    @TableField(exist = false)
+    private String tenantCode;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Dict.java

@@ -0,0 +1,55 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:03
+ */
+@Data
+@ApiModel(description = "字典(业务类)")
+@TableName("sys_dict")
+public class Dict implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典id")
+    @TableId(type = IdType.AUTO)
+    private Integer dictId;
+
+    @ApiModelProperty(value = "字典标识")
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典名称")
+    private String dictName;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/DictData.java

@@ -0,0 +1,63 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典数据
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Data
+@ApiModel(description = "字典数据(业务类)")
+@TableName("sys_dict_data")
+public class DictData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典数据id")
+    @TableId(type = IdType.AUTO)
+    private Integer dictDataId;
+
+    @ApiModelProperty(value = "字典id")
+    private Integer dictId;
+
+    @ApiModelProperty(value = "字典数据标识")
+    private String dictDataCode;
+
+    @ApiModelProperty(value = "字典数据名称")
+    private String dictDataName;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "字典代码")
+    @TableField(exist = false)
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典名称")
+    @TableField(exist = false)
+    private String dictName;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Dictionary.java

@@ -0,0 +1,56 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 字典
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:03
+ */
+@Data
+@ApiModel(description = "字典(系统类)")
+@TableName("sys_dictionary")
+public class Dictionary implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典id")
+    @TableId(type = IdType.AUTO)
+    private Integer dictId;
+
+    @ApiModelProperty(value = "字典标识")
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典名称")
+    private String dictName;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/DictionaryData.java

@@ -0,0 +1,64 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 字典数据
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Data
+@ApiModel(description = "字典数据(系统类)")
+@TableName("sys_dictionary_data")
+public class DictionaryData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典数据id")
+    @TableId(type = IdType.AUTO)
+    private Integer dictDataId;
+
+    @ApiModelProperty(value = "字典id")
+    private Integer dictId;
+
+    @ApiModelProperty(value = "字典数据标识")
+    private String dictDataCode;
+
+    @ApiModelProperty(value = "字典数据名称")
+    private String dictDataName;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "字典代码")
+    @TableField(exist = false)
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典名称")
+    @TableField(exist = false)
+    private String dictName;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/EmailRecord.java

@@ -0,0 +1,56 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 邮件发送记录
+ *
+ * @author WebSoft
+ * @since 2021-08-29 12:36:35
+ */
+@Data
+@ApiModel(description = "邮件发送记录")
+@TableName("sys_email_record")
+public class EmailRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("邮件标题")
+    private String title;
+
+    @ApiModelProperty("邮件内容")
+    private String content;
+
+    @ApiModelProperty("收件邮箱")
+    private String receiver;
+
+    @ApiModelProperty("发件邮箱")
+    private String sender;
+
+    @ApiModelProperty("创建人")
+    private Integer createUserId;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java

@@ -0,0 +1,88 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件上传记录
+ *
+ * @author WebSoft
+ * @since 2021-08-29 12:36:32
+ */
+@Data
+@ApiModel(description = "文件上传记录")
+@TableName("sys_file_record")
+public class FileRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("分组ID")
+    private Integer groupId;
+
+    @ApiModelProperty("文件名称")
+    private String name;
+
+    @ApiModelProperty("文件存储路径")
+    private String path;
+
+    @ApiModelProperty("文件大小")
+    private Long length;
+
+    @ApiModelProperty("文件类型")
+    private String contentType;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty("创建人")
+    private Integer createUserId;
+
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty("商户编号")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("文件访问地址")
+    @TableField(exist = false)
+    private String url;
+
+    @ApiModelProperty("文件缩略图访问地址")
+    @TableField(exist = false)
+    private String thumbnail;
+
+    @ApiModelProperty("文件下载地址")
+    @TableField(exist = false)
+    private String downloadUrl;
+
+    @ApiModelProperty("创建人账号")
+    @TableField(exist = false)
+    private String createUsername;
+
+    @ApiModelProperty("创建人名称")
+    @TableField(exist = false)
+    private String createNickname;
+
+    @ApiModelProperty("用户头像")
+    @TableField(exist = false)
+    private String avatar;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Industry.java

@@ -0,0 +1,61 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 企业行业记录表
+ *
+ * @author 科技小王子
+ * @since 2023-05-17 11:26:43
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Industry对象", description = "企业行业记录表")
+@TableName("sys_industry")
+public class Industry implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "行业id")
+    @TableId(value = "industry_id", type = IdType.AUTO)
+    private Integer industryId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "上级分类ID")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/KVEntity.java

@@ -0,0 +1,56 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 租户
+ *
+ * @author WebSoft
+ * @since 2021-08-28 11:31:06
+ */
+@Data
+@ApiModel(description = "实体")
+public class KVEntity<K,V> implements Serializable {
+    private static final long serialVersionUID = 1L;
+    protected K k;
+    protected V v;
+  public KVEntity() {
+    super();
+  }
+
+  public KVEntity(K k, V v) {
+    super();
+    this.k = k;
+    this.v = v;
+  }
+
+  public static <K, V> KVEntity<K, V> build(K k, V v) {
+    return new KVEntity<>(k, v);
+  }
+
+  public K getK() {
+    return k;
+  }
+
+  public void setK(K k) {
+    this.k = k;
+  }
+
+  public V getV() {
+    return v;
+  }
+
+  public void setV(V v) {
+    this.v = v;
+  }
+
+}

src/main/java/com/gxwebsoft/common/system/entity/LoginRecord.java

@@ -0,0 +1,73 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 登录日志
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:41
+ */
+@Data
+@ApiModel(description = "登录日志")
+@TableName("sys_login_record")
+public class LoginRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+    public static final int TYPE_LOGIN = 0;  // 登录成功
+    public static final int TYPE_ERROR = 1;  // 登录失败
+    public static final int TYPE_LOGOUT = 2;  // 退出登录
+    public static final int TYPE_REFRESH = 3;  // 续签token
+    public static final int TYPE_REGISTER = 4;  // 注册成功
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("用户账号")
+    private String username;
+
+    @ApiModelProperty("操作系统")
+    private String os;
+
+    @ApiModelProperty("设备名称")
+    private String device;
+
+    @ApiModelProperty("浏览器类型")
+    private String browser;
+
+    @ApiModelProperty("ip地址")
+    private String ip;
+
+    @ApiModelProperty("操作类型, 0登录成功, 1登录失败, 2退出登录, 3续签token")
+    private Integer loginType;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("操作时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("用户id")
+    @TableField(exist = false)
+    private Integer userId;
+
+    @ApiModelProperty("用户昵称")
+    @TableField(exist = false)
+    private String nickname;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Menu.java

@@ -0,0 +1,84 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 菜单
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:17
+ */
+@Data
+@ApiModel(description = "菜单")
+@TableName("sys_menu")
+public class Menu implements GrantedAuthority {
+    private static final long serialVersionUID = 1L;
+    public static final int TYPE_MENU = 0;  // 菜单类型
+    public static final int TYPE_BTN = 1;  // 按钮类型
+
+    @ApiModelProperty("菜单id")
+    @TableId(type = IdType.AUTO)
+    private Integer menuId;
+
+    @ApiModelProperty("上级id, 0是顶级")
+    private Integer parentId;
+
+    @ApiModelProperty("菜单名称")
+    private String title;
+
+    @ApiModelProperty("菜单路由地址")
+    private String path;
+
+    @ApiModelProperty("菜单组件地址")
+    private String component;
+
+    @ApiModelProperty("菜单类型, 0菜单, 1按钮")
+    private Integer menuType;
+
+    @ApiModelProperty("排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty("权限标识")
+    private String authority;
+
+    @ApiModelProperty("菜单图标")
+    private String icon;
+
+    @ApiModelProperty("是否隐藏, 0否, 1是(仅注册路由不显示左侧菜单)")
+    private Integer hide;
+
+    @ApiModelProperty("路由元信息")
+    private String meta;
+
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty("关联应用")
+    private Integer appId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("子菜单")
+    @TableField(exist = false)
+    private List<Menu> children;
+
+    @ApiModelProperty("角色权限树选中状态")
+    @TableField(exist = false)
+    private Boolean checked;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/OperationRecord.java

@@ -0,0 +1,95 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:33
+ */
+@Data
+@ApiModel(description = "操作日志")
+@TableName("sys_operation_record")
+public class OperationRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    private Integer userId;
+
+    @ApiModelProperty("操作模块")
+    private String module;
+
+    @ApiModelProperty("操作功能")
+    private String description;
+
+    @ApiModelProperty("请求地址")
+    private String url;
+
+    @ApiModelProperty("请求方式")
+    private String requestMethod;
+
+    @ApiModelProperty("调用方法")
+    private String method;
+
+    @ApiModelProperty("请求参数")
+    private String params;
+
+    @ApiModelProperty("返回结果")
+    private String result;
+
+    @ApiModelProperty("异常信息")
+    private String error;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty("消耗时间, 单位毫秒")
+    private Long spendTime;
+
+    @ApiModelProperty("操作系统")
+    private String os;
+
+    @ApiModelProperty("设备名称")
+    private String device;
+
+    @ApiModelProperty("浏览器类型")
+    private String browser;
+
+    @ApiModelProperty("ip地址")
+    private String ip;
+
+    @ApiModelProperty("状态, 0成功, 1异常")
+    private Integer status;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("操作时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("用户昵称")
+    @TableField(exist = false)
+    private String nickname;
+
+    @ApiModelProperty("用户账号")
+    @TableField(exist = false)
+    private String username;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Organization.java

@@ -0,0 +1,77 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 组织机构
+ *
+ * @author WebSoft
+ * @since 2020-03-14 11:29:04
+ */
+@Data
+@ApiModel(description = "组织机构")
+@TableName("sys_organization")
+public class Organization implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构id")
+    @TableId(type = IdType.AUTO)
+    private Integer organizationId;
+
+    @ApiModelProperty(value = "上级id, 0是顶级")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String organizationName;
+
+    @ApiModelProperty(value = "机构全称")
+    private String organizationFullName;
+
+    @ApiModelProperty(value = "机构代码")
+    private String organizationCode;
+
+    @ApiModelProperty(value = "机构类型, 字典标识")
+    private String organizationType;
+
+    @ApiModelProperty(value = "负责人id")
+    private Integer leaderId;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "机构类型名称")
+    @TableField(exist = false)
+    private String organizationTypeName;
+
+    @ApiModelProperty(value = "负责人姓名")
+    @TableField(exist = false)
+    private String leaderNickname;
+
+    @ApiModelProperty(value = "负责人账号")
+    @TableField(exist = false)
+    private String leaderUsername;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Plug.java

@@ -0,0 +1,144 @@
+package com.gxwebsoft.common.system.entity;
+
+import cn.hutool.core.util.NumberUtil;
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 插件扩展
+ *
+ * @author 科技小王子
+ * @since 2023-05-18 11:57:37
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Plug对象", description = "插件扩展")
+@TableName("sys_plug")
+public class Plug implements Serializable {
+    private static final long serialVersionUID = 1L;
+    public static final int TYPE_MENU = 0;  // 菜单类型
+    public static final int TYPE_BTN = 1;  // 按钮类型
+
+    @ApiModelProperty(value = "插件id")
+    @TableId(value = "plug_id", type = IdType.AUTO)
+    private Integer plugId;
+
+    @ApiModelProperty(value = "菜单ID")
+    private Integer menuId;
+
+    @ApiModelProperty(value = "上级id, 0是顶级")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "菜单名称")
+    private String title;
+
+    @ApiModelProperty(value = "菜单路由地址")
+    private String path;
+
+    @ApiModelProperty(value = "菜单组件地址, 目录可为空")
+    private String component;
+
+    @ApiModelProperty(value = "类型, 0菜单, 1按钮")
+    private Integer menuType;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "权限标识")
+    private String authority;
+
+    @ApiModelProperty(value = "打开位置")
+    private String target;
+
+    @ApiModelProperty(value = "菜单图标")
+    private String icon;
+
+    @ApiModelProperty(value = "图标颜色")
+    private String color;
+
+    @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+    private Integer hide;
+
+    @ApiModelProperty(value = "菜单侧栏选中的path")
+    private String active;
+
+    @ApiModelProperty(value = "其它路由元信息")
+    private String meta;
+
+    @ApiModelProperty(value = "插件描述")
+    private String comments;
+
+    @ApiModelProperty(value = "插件详情")
+    private String content;
+
+    @ApiModelProperty("评分")
+    private BigDecimal score;
+
+    @ApiModelProperty("插件价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("浏览次数")
+    private Integer clicks;
+
+    @ApiModelProperty("安装次数")
+    private Integer installs;
+
+    @ApiModelProperty(value = "关联应用ID")
+    private Integer appId;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "商户编码")
+    private String merchantCode;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("子菜单")
+    @TableField(exist = false)
+    private List<Menu> children;
+
+    @ApiModelProperty("角色权限树选中状态")
+    @TableField(exist = false)
+    private Boolean checked;
+
+    @ApiModelProperty("租户名称")
+    @TableField(exist = false)
+    private String tenantName;
+
+    @ApiModelProperty("企业名称")
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty("企业简称")
+    @TableField(exist = false)
+    private String shortName;
+
+    @ApiModelProperty("企业域名")
+    @TableField(exist = false)
+    private String domain;
+}

src/main/java/com/gxwebsoft/common/system/entity/Role.java

@@ -0,0 +1,53 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 角色
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:01
+ */
+@Data
+@ApiModel(description = "角色")
+@TableName("sys_role")
+public class Role implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("角色id")
+    @TableId(type = IdType.AUTO)
+    private Integer roleId;
+
+    @ApiModelProperty("角色标识")
+    private String roleCode;
+
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private Integer userId;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/RoleMenu.java

@@ -0,0 +1,44 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 角色菜单
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:54
+ */
+@Data
+@ApiModel(description = "角色权限")
+@TableName("sys_role_menu")
+public class RoleMenu implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("角色id")
+    private Integer roleId;
+
+    @ApiModelProperty("菜单id")
+    private Integer menuId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Setting.java

@@ -0,0 +1,60 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 系统设置
+ *
+ * @author WebSoft
+ * @since 2022-11-19 13:54:27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Setting对象", description = "系统设置")
+@TableName("sys_setting")
+public class Setting implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "setting_id", type = IdType.AUTO)
+    private Integer settingId;
+
+    @ApiModelProperty(value = "设置项标示")
+    private String settingKey;
+
+    @ApiModelProperty(value = "设置内容（json格式）")
+    private String content;
+
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;
+
+    @ApiModelProperty(value = "备注")
+    private String comments;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改租户名称")
+    @TableField(exist = false)
+    private String tenantName;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/Tenant.java

@@ -0,0 +1,49 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 租户
+ *
+ * @author WebSoft
+ * @since 2021-08-28 11:31:06
+ */
+@Data
+@ApiModel(description = "租户")
+@TableName("sys_tenant")
+public class Tenant implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty("租户id")
+  @TableId(type = IdType.AUTO)
+  private Integer tenantId;
+
+  @ApiModelProperty("租户名称")
+  private String tenantName;
+
+  @ApiModelProperty(value = "租户编号")
+  private String tenantCode;
+
+  @ApiModelProperty(value = "租户标识")
+  private String logo;
+
+  @ApiModelProperty("备注")
+  private String comments;
+
+  @ApiModelProperty("是否删除, 0否, 1是")
+  @TableLogic
+  private Integer deleted;
+
+  @ApiModelProperty("创建时间")
+  private Date createTime;
+
+  @ApiModelProperty("修改时间")
+  private Date updateTime;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -0,0 +1,243 @@
+package com.gxwebsoft.common.system.entity;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gxwebsoft.oa.entity.App;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:13
+ */
+@Data
+@ApiModel(description = "用户")
+@TableName("sys_user")
+public class User implements UserDetails {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("用户id")
+    @TableId(type = IdType.AUTO)
+    private Integer userId;
+
+    @ApiModelProperty("用户类型, 0普通用户 6开发者 10企业用户")
+    private Integer type;
+
+    @ApiModelProperty("用户编码")
+    private String userCode;
+
+    @ApiModelProperty("账号")
+    private String username;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty("昵称")
+    private String nickname;
+
+    @ApiModelProperty("头像")
+    private String avatar;
+
+    @ApiModelProperty("性别, 字典标识")
+    private String sex;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    @ApiModelProperty("职务")
+    private String position;
+
+    @ApiModelProperty("邮箱是否验证, 0否, 1是")
+    private Integer emailVerified;
+
+    @ApiModelProperty("别名")
+    private String alias;
+
+    @ApiModelProperty("真实姓名")
+    private String realName;
+
+    @ApiModelProperty("身份证号")
+    private String idCard;
+
+    @ApiModelProperty("出生日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    @ApiModelProperty("所在国家")
+    private String country;
+
+    @ApiModelProperty(value = "所在省份")
+    private String province;
+
+    @ApiModelProperty(value = "所在城市")
+    private String city;
+
+    @ApiModelProperty(value = "所在辖区")
+    private String region;
+
+    @ApiModelProperty("街道地址")
+    private String address;
+
+    @ApiModelProperty("用户可用余额")
+    private BigDecimal balance;
+
+    @ApiModelProperty("用户可用积分")
+    private Integer points;
+
+    @ApiModelProperty("用户总支付的金额")
+    private String payMoney;
+
+    @ApiModelProperty("实际消费的金额(不含退款)")
+    private String expendMoney;
+
+    @ApiModelProperty("会员等级ID")
+    private Integer gradeId;
+
+    @ApiModelProperty("个人简介")
+    private String introduction;
+
+    @ApiModelProperty("机构ID")
+    private Integer organizationId;
+
+    @ApiModelProperty("客户ID")
+    private Integer customerId;
+
+    @ApiModelProperty("企业ID")
+    private Integer companyId;
+
+    @ApiModelProperty("注册来源客户端")
+    private String platform;
+
+    @ApiModelProperty("备注")
+    private String comments;
+
+    @ApiModelProperty("状态, 0正常, 1冻结")
+    private Integer status;
+
+    @ApiModelProperty("是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "租户名称")
+    @TableField(exist = false)
+    private String tenantName;
+
+    @ApiModelProperty(value = "最后结算时间")
+    private Date settlementTime;
+
+    @ApiModelProperty("注册时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("公司名称")
+    private String companyName;
+
+    @ApiModelProperty("是否已实名认证")
+    private Integer certification;
+
+    @ApiModelProperty("机构名称")
+    @TableField(exist = false)
+    private String organizationName;
+
+    @ApiModelProperty("性别名称")
+    @TableField(exist = false)
+    private String sexName;
+
+    @ApiModelProperty("默认注册的角色ID")
+    @TableField(exist = false)
+    private Integer roleId;
+
+    @ApiModelProperty("角色列表")
+    @TableField(exist = false)
+    private List<Role> roles;
+
+    @ApiModelProperty("权限列表")
+    @TableField(exist = false)
+    private List<Menu> authorities;
+
+    @ApiModelProperty("微信凭证")
+    @TableField(exist = false)
+    private String code;
+
+    @ApiModelProperty("所属商户的编号")
+    @TableField(exist = false)
+    private String merchantCode;
+
+    @ApiModelProperty("所属商户名称")
+    @TableField(exist = false)
+    private String merchantName;
+
+    @ApiModelProperty("ico文件")
+    @TableField(exist = false)
+    private String logo;
+
+    @ApiModelProperty("创建的应用数量")
+    @TableField(exist = false)
+    private Double apps;
+
+    @ApiModelProperty("租户设置信息")
+    @TableField(exist = false)
+    private String setting;
+
+    @ApiModelProperty("手机号(脱敏)")
+    @TableField(exist = false)
+    private String mobile;
+
+    @ApiModelProperty("应用信息")
+    @TableField(exist = false)
+    private App appInfo;
+
+    @ApiModelProperty("企业信息")
+    @TableField(exist = false)
+    private Company companyInfo;
+
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return this.status != null && this.status == 0;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+//
+//    public String getRealName(){
+//      return DesensitizedUtil.chineseName(this.realName);
+//    }
+//
+//    public String getIdCard(){
+//      return DesensitizedUtil.idCardNum(this.idCard,1,2);
+//    }
+    public String getMobile(){
+      return DesensitizedUtil.mobilePhone(this.phone);
+    }
+
+}

src/main/java/com/gxwebsoft/common/system/entity/UserFile.java

@@ -0,0 +1,76 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户文件
+ *
+ * @author WebSoft
+ * @since 2022-07-21 14:34:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "UserFile对象", description = "用户文件")
+@TableName("sys_user_file")
+public class UserFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+
+    @ApiModelProperty(value = "是否是文件夹, 0否, 1是")
+    private Integer isDirectory;
+
+    @ApiModelProperty(value = "上级id")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "文件路径")
+    private String path;
+
+    @ApiModelProperty(value = "文件大小")
+    private Integer length;
+
+    @ApiModelProperty("文件类型")
+    private String contentType;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("文件访问地址")
+    @TableField(exist = false)
+    private String url;
+
+    @ApiModelProperty("文件缩略图访问地址")
+    @TableField(exist = false)
+    private String thumbnail;
+
+    @ApiModelProperty("文件下载地址")
+    @TableField(exist = false)
+    private String downloadUrl;
+
+}

src/main/java/com/gxwebsoft/common/system/entity/UserRole.java

@@ -0,0 +1,49 @@
+package com.gxwebsoft.common.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户角色
+ *
+ * @author WebSoft
+ * @since 2018-12-24 16:10:23
+ */
+@Data
+@ApiModel(description = "用户角色")
+@TableName("sys_user_role")
+public class UserRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键id")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    private Integer userId;
+
+    @ApiModelProperty("角色id")
+    private Integer roleId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("角色名称")
+    @TableField(exist = false)
+    private String roleName;
+
+    @ApiModelProperty("租户ID")
+    private Integer tenantId;
+
+}