修改entity

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicAttachment.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,15 +22,10 @@ import java.math.BigDecimal;
  * @since 2021-03-23
  */
 @TableName("basic_attachment")
-public class BasicAttachment implements Serializable {
+public class BasicAttachment extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "附件名称")
     @TableField(value = "name")
     private String name;
@@ -50,15 +46,6 @@ public class BasicAttachment implements Serializable {
     @TableField(value = "md5")
     private String md5;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    private Long createTime;
-
-    @ApiModelProperty(value = "创建人id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("create_id")
-    private Long createId;
-
     @ApiModelProperty(value = "关联业务id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("obj_id")
@@ -67,33 +54,59 @@ public class BasicAttachment implements Serializable {
     @TableField(exist = false)
     private Integer pages;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     public BasicAttachment() {
 
     }
 
     public BasicAttachment(String path, String name, String type, BigDecimal size, String md5, Long createId) {
-        this.id = SystemConstant.getDbUuid();
+        setId(SystemConstant.getDbUuid());
         this.path = path;
         this.name = name;
         this.type = type;
         this.size = size;
         this.md5 = md5;
-        this.createTime = System.currentTimeMillis();
-        this.createId = createId;
+        setCreateTime(System.currentTimeMillis());
+        setCreateId(createId);
     }
 
     public BasicAttachment(String path, String name, String type, BigDecimal size, String md5, Long createId, Long objId) {
-        this.id = SystemConstant.getDbUuid();
+        setId(SystemConstant.getDbUuid());
         this.path = path;
         this.name = name;
         this.type = type;
         this.size = size;
         this.md5 = md5;
-        this.createTime = System.currentTimeMillis();
-        this.createId = createId;
+        setCreateTime(System.currentTimeMillis());
+        setCreateId(createId);
         this.objId = objId;
     }
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getObjId() {
         return objId;
     }
@@ -106,14 +119,6 @@ public class BasicAttachment implements Serializable {
         return serialVersionUID;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
@@ -154,22 +159,6 @@ public class BasicAttachment implements Serializable {
         this.md5 = md5;
     }
 
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
     public Integer getPages() {
         return pages;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicCourse.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,12 +22,16 @@ public class BasicCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 学校ID
-     */
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 课程编码
      */
@@ -36,6 +41,18 @@ public class BasicCourse extends BaseEntity implements Serializable {
      */
     private String name;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -59,5 +76,4 @@ public class BasicCourse extends BaseEntity implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicSchool.java

@@ -21,12 +21,18 @@ public class BasicSchool extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String code;
+
     private String name;
+
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
+
     @TableField("access_key")
     private String accessKey;
+
     @TableField("access_secret")
     private String accessSecret;
+
     private String remark;
 
     @ApiModelProperty(value = "学校logo")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicUserCourse.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,6 +22,16 @@ public class BasicUserCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 用户ID
      */
@@ -34,6 +45,26 @@ public class BasicUserCourse extends BaseEntity implements Serializable {
     @TableField("course_id")
     private Long courseId;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getUserId() {
         return userId;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysConfig.java

@@ -2,7 +2,10 @@ package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -19,6 +22,16 @@ public class SysConfig extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 参数键值
      */
@@ -38,6 +51,26 @@ public class SysConfig extends BaseEntity implements Serializable {
 
     private String remark;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getConfigKey() {
         return configKey;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysOrg.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -21,12 +22,11 @@ public class SysOrg extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 学校ID
-     */
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
     /**
      * 机构代码
      */
@@ -41,9 +41,8 @@ public class SysOrg extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("parent_id")
     private Long parentId;
-    /**
-     * 0-禁用，1-启用
-     */
+
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
     public Long getSchoolId() {
@@ -85,5 +84,4 @@ public class SysOrg extends BaseEntity implements Serializable {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
-
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysPrivilege.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -20,14 +21,23 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_privilege")
-public class SysPrivilege implements Serializable {
+public class SysPrivilege extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "是否公用，0：否，1：是")
+    @TableField("common")
+    private Boolean common;
 
     @ApiModelProperty(value = "名称")
     @TableField(value = "name")
@@ -58,24 +68,36 @@ public class SysPrivilege implements Serializable {
     @TableField(value = "remark")
     private String remark;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    private Long createTime;
-
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     @TableField(value = "enable")
     private Boolean enable;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
     }
 
-    public Long getId() {
-        return id;
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public Boolean getCommon() {
+        return common;
+    }
+
+    public void setCommon(Boolean common) {
+        this.common = common;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
     public String getName() {
@@ -134,14 +156,6 @@ public class SysPrivilege implements Serializable {
         this.remark = remark;
     }
 
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
     public Boolean getEnable() {
         return enable;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRole.java

@@ -23,12 +23,16 @@ public class SysRole extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 学校ID
-     */
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 角色名称
      */
@@ -37,7 +41,7 @@ public class SysRole extends BaseEntity implements Serializable {
     /**
      * 是否启用
      */
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
     @ApiModelProperty(value = "角色类别，ADMIN：超级管理员，SCHOOL_ADMIN：学校管理员：EXAM_TEACHER：考务老师，QUESTION_TEACHER：命题老师，CUSTOMER：客服人员，PRINTER：印刷人员，CUSTOM：自定义")
@@ -48,6 +52,18 @@ public class SysRole extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private Long[] privilegeIds;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysRolePrivilege.java

@@ -41,7 +41,7 @@ public class SysRolePrivilege implements Serializable {
     @TableField("privilege_id")
     private Long privilegeId;
 
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     @TableField(value = "enable")
     private Boolean enable;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysUser.java

@@ -9,6 +9,7 @@ import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.service.SysConfigService;
 import com.qmth.teachcloud.common.util.Base64Util;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
 
@@ -29,9 +30,7 @@ public class SysUser extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 学校ID
-     */
+    @ApiModelProperty(value = "学校id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
@@ -61,12 +60,12 @@ public class SysUser extends BaseEntity implements Serializable {
     @Length(message = "手机号码不能超过{max}个字符", max = 25)
     private String mobileNumber;
 
+    @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField("org_id")
     private Long orgId;
-    /**
-     * 0-禁用，1-启用
-     */
+
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable = true;
     /**
      * 密码修改时间

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysUserRole.java

@@ -47,7 +47,7 @@ public class SysUserRole implements Serializable {
     @TableField(value = "privilege_id")
     private Long privilegeId;
 
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     @TableField(value = "enable")
     private Boolean enable;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TBSession.java

@@ -29,6 +29,16 @@ public class TBSession implements Serializable {
     @TableId(value = "id")
     private String id;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("org_id")
+    private Long orgId;
+
     @ApiModelProperty(value = "用户标识")
     @TableField(value = "identity")
     private String identity;
@@ -105,6 +115,22 @@ public class TBSession implements Serializable {
         this.lastAccessIp = ServletUtil.getRequest().getLocalAddr();
     }
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public AppSourceEnum getAppSource() {
         return appSource;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TBTask.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
@@ -24,15 +25,10 @@ import java.io.Serializable;
  * @since 2021-03-19
  */
 @ApiModel(value = "TBTask对象", description = "导入导出任务表")
-public class TBTask implements Serializable {
+public class TBTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "任务类型，QUESTION_MISSION_BATCH_CREATE：批量新建命题任务，SAMPLE_EXPORT：导出审核样本，EXAMINATION_IMPORT：考务数据导入，EXAMINATION_EXPORT：考务数据导出，PRINT_PDF_DOWNLOAD：批量下载pdf，CREATE_PDF：生成pdf")
     @TableField(value = "type")
     private TaskTypeEnum type;
@@ -93,15 +89,6 @@ public class TBTask implements Serializable {
     @TableField(value = "report_file_path")
     private String reportFilePath;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    private Long createTime;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人id")
-    @TableField("create_id")
-    private Long createId;
-
     @ApiModelProperty(value = "备注")
     @TableField(value = "remark")
     private String remark;
@@ -175,49 +162,41 @@ public class TBTask implements Serializable {
     }
 
     public TBTask(TaskTypeEnum type, Long entityId, TaskStatusEnum status, String summary, String importFileName, String importFilePath, Long createId, Long schoolId) {
-        this.id = SystemConstant.getDbUuid();
+        setId(SystemConstant.getDbUuid());
         this.type = type;
         this.entityId = entityId;
         this.status = status;
         this.summary = summary;
         this.importFileName = importFileName;
         this.importFilePath = importFilePath;
-        this.createId = createId;
-        this.createTime = System.currentTimeMillis();
+        setCreateId(createId);
+        setCreateTime(System.currentTimeMillis());
         this.schoolId = schoolId;
     }
 
     public TBTask(TaskTypeEnum type, TaskStatusEnum status, String summary, String importFileName, String importFilePath, Long createId, Long schoolId) {
-        this.id = SystemConstant.getDbUuid();
+        setId(SystemConstant.getDbUuid());
         this.type = type;
         this.status = status;
         this.summary = summary;
         this.importFileName = importFileName;
         this.importFilePath = importFilePath;
-        this.createId = createId;
-        this.createTime = System.currentTimeMillis();
+        setCreateId(createId);
+        setCreateTime(System.currentTimeMillis());
         this.schoolId = schoolId;
     }
 
     public TBTask(TaskTypeEnum type, TaskStatusEnum status, String importFileName, String importFilePath, Long createId, Long schoolId) {
-        this.id = SystemConstant.getDbUuid();
+        setId(SystemConstant.getDbUuid());
         this.type = type;
         this.status = status;
         this.importFileName = importFileName;
         this.importFilePath = importFilePath;
-        this.createId = createId;
-        this.createTime = System.currentTimeMillis();
+        setCreateId(createId);
+        setCreateTime(System.currentTimeMillis());
         this.schoolId = schoolId;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getSchoolId() {
         return schoolId;
     }
@@ -325,20 +304,4 @@ public class TBTask implements Serializable {
     public void setReportFilePath(String reportFilePath) {
         this.reportFilePath = reportFilePath;
     }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TGError.java

@@ -29,6 +29,16 @@ public class TGError implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "学校id")
+    @TableField(value = "school_id")
+    private Long schoolId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "机构id")
+    @TableField(value = "org_id")
+    private Long orgId;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "实体id")
     @TableField("obj_id")
@@ -53,6 +63,22 @@ public class TGError implements Serializable {
         this.createTime = System.currentTimeMillis();
     }
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/TMMqMessage.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.enums.MqTagEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,13 +21,18 @@ import java.util.Map;
  * @Date: 2020/7/9
  */
 @ApiModel(value = "t_m_mq_message", description = "mq消息")
-public class TMMqMessage implements Serializable {
+public class TMMqMessage extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private String id;
+    @ApiModelProperty(value = "学校id")
+    @TableField(value = "school_id")
+    private Long schoolId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "机构id")
+    @TableField(value = "org_id")
+    private Long orgId;
 
     @ApiModelProperty(value = "消息topic")
     @TableField(value = "topic")
@@ -67,14 +73,26 @@ public class TMMqMessage implements Serializable {
     @TableField(value = "properties")
     private String prop;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private Long createTime;
-
     @ApiModelProperty(value = "时间戳")
     @TableField(value = "timestamp")
     private Long timestamp;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
     public String getProp() {
         return prop;
     }
@@ -87,14 +105,6 @@ public class TMMqMessage implements Serializable {
         return serialVersionUID;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getTopic() {
         return topic;
     }
@@ -143,14 +153,6 @@ public class TMMqMessage implements Serializable {
         this.sequence = sequence;
     }
 
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
     public Object getBody() {
         return body;
     }