权限管理模块-数据库字段更新

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuth.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -43,17 +43,29 @@ public class DataAuth implements Serializable {
     @TableField("hospital_id")
     private String hospitalId;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DataAuthDetail.java

@@ -43,17 +43,29 @@ public class DataAuthDetail implements Serializable {
     @TableField("detail_id")
     private Long detailId;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dept.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -54,17 +54,29 @@ public class Dept implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/DeptDoctor.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,14 +38,6 @@ public class DeptDoctor implements Serializable {
     @TableField("doctor_id")
     private Long doctorId;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -54,5 +46,25 @@ public class DeptDoctor implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Dictionaries.java

@@ -4,11 +4,12 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -50,5 +51,25 @@ public class Dictionaries implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Doctor.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -47,17 +47,29 @@ public class Doctor implements Serializable {
     @TableField("occup")
     private String occup;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Hospital.java

@@ -4,41 +4,38 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 组织表
+ * 组织机构表
  * </p>
  */
 @Data
 @TableName("sys_hospital")
-@ApiModel(value="Hospital对象", description="组织表")
+@ApiModel(value="Hospital对象", description="组织机构表")
 public class Hospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "编号")
+    @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "父级组织机构id")
     @TableField("parent_id")
     private Long parentId;
 
-    @ApiModelProperty(value = "医院编码")
-    @TableField("org_code")
-    private String orgCode;
-
-    @ApiModelProperty(value = "父级编码")
-    @TableField("parent_code")
-    private String parentCode;
+    @ApiModelProperty(value = "组织机构代码")
+    @TableField("code")
+    private String code;
 
-    @ApiModelProperty(value = "名称")
+    @ApiModelProperty(value = "组织机构名称")
     @TableField("name")
     private String name;
 
@@ -46,7 +43,7 @@ public class Hospital implements Serializable {
     @TableField("region")
     private String region;
 
-    @ApiModelProperty(value = "组织类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
+    @ApiModelProperty(value = "组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院）")
     @TableField("type")
     private String type;
 
@@ -54,21 +51,33 @@ public class Hospital implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "状态 0:禁用，1：启用")
+    @ApiModelProperty(value = "状态：0-禁用，1-启用")
     @TableField("status")
     private String status;
 
-    @ApiModelProperty(value = "创建者编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/HospitalUser.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,17 +35,29 @@ public class HospitalUser implements Serializable {
     @TableField("user_id")
     private Long userId;
 
-    @ApiModelProperty(value = "创建者编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Log.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -59,10 +59,6 @@ public class Log implements Serializable {
     @TableField("exception")
     private String exception;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_date")
-    private Date createDate;
-
     @ApiModelProperty(value = "操作人")
     @TableField("operator")
     private String operator;
@@ -71,5 +67,25 @@ public class Log implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/LoginLog.java

@@ -3,9 +3,9 @@ package com.lantone.dblayermbg.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -49,13 +49,29 @@ public class LoginLog implements Serializable {
     @TableField("login_browser")
     private String loginBrowser;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Medoup.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -42,17 +42,29 @@ public class Medoup implements Serializable {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MedoupDoctor.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,17 +38,29 @@ public class MedoupDoctor implements Serializable {
     @TableField("dcotor_id")
     private Long dcotorId;
 
-    @ApiModelProperty(value = "创建者")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Menu.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -63,21 +63,29 @@ public class Menu implements Serializable {
     @TableField("describe")
     private String describe;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
 
-    @ApiModelProperty(value = "创建用户编号")
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
     @TableField("creator")
-    private Long creator;
+    private String creator;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
 
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    @TableField("is_deleted")
-    private String isDeleted;
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
 
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/MenuResource.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,18 +35,6 @@ public class MenuResource implements Serializable {
     @TableField("resource_id")
     private Long resourceId;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -55,5 +43,25 @@ public class MenuResource implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Region.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -50,17 +50,29 @@ public class Region implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RegionDept.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -39,18 +39,6 @@ public class RegionDept implements Serializable {
     @TableField("dept_id")
     private Long deptId;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -59,5 +47,25 @@ public class RegionDept implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Resource.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -51,21 +51,29 @@ public class Resource implements Serializable {
     @TableField("describe")
     private String describe;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
 
-    @ApiModelProperty(value = "创建用户编号")
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
     @TableField("creator")
-    private Long creator;
+    private String creator;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
 
-    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
-    @TableField("is_deleted")
-    private String isDeleted;
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
 
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/Role.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -31,10 +31,6 @@ public class Role implements Serializable {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "角色描述")
-    @TableField("remark")
-    private String remark;
-
     @ApiModelProperty(value = "状态 0:禁用，1：启用")
     @TableField("status")
     private String status;
@@ -43,14 +39,6 @@ public class Role implements Serializable {
     @TableField("hospital_id")
     private Long hospitalId;
 
-    @ApiModelProperty(value = "创建用户id")
-    @TableField("creator")
-    private String creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -59,5 +47,25 @@ public class Role implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceDataAuth.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -34,17 +34,29 @@ public class RoleServiceDataAuth implements Serializable {
     @TableField("service_data_auth_id")
     private Long serviceDataAuthId;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceMenu.java

@@ -0,0 +1,62 @@
+package com.lantone.dblayermbg.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 lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色系统功能菜单关联表
+ * </p>
+ */
+@Data
+@TableName("sys_role_service_menu")
+@ApiModel(value="RoleServiceMenu对象", description="角色系统功能菜单关联表")
+public class RoleServiceMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "角色id")
+    @TableField("role_id")
+    private Long roleId;
+
+    @ApiModelProperty(value = "系统功能菜单关联id")
+    @TableField("service_menu_id")
+    private Long serviceMenuId;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/RoleServiceResource.java

@@ -0,0 +1,62 @@
+package com.lantone.dblayermbg.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 lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 角色系统资源关联表
+ * </p>
+ */
+@Data
+@TableName("sys_role_service_resource")
+@ApiModel(value="RoleServiceResource对象", description="角色系统资源关联表")
+public class RoleServiceResource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "角色id")
+    @TableField("role_id")
+    private Long roleId;
+
+    @ApiModelProperty(value = "系统资源关联id")
+    @TableField("service_resource_id")
+    private Long serviceResourceId;
+
+    @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceDataAuth.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,17 +35,29 @@ public class ServiceDataAuth implements Serializable {
     @TableField("data_auth_id")
     private Long dataAuthId;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceMenu.java

@@ -4,21 +4,21 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 角色服务菜单功能关联表
+ * 系统菜单功能关联表
  * </p>
  */
 @Data
 @TableName("sys_service_menu")
-@ApiModel(value="ServiceMenu对象", description="角色服务菜单功能关联表")
+@ApiModel(value="ServiceMenu对象", description="系统菜单功能关联表")
 public class ServiceMenu implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -27,9 +27,9 @@ public class ServiceMenu implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "角色系统编号")
-    @TableField("role_service_id")
-    private Long roleServiceId;
+    @ApiModelProperty(value = "系统编号")
+    @TableField("service_id")
+    private Long serviceId;
 
     @ApiModelProperty(value = "菜单功能编号")
     @TableField("menu_id")
@@ -39,17 +39,29 @@ public class ServiceMenu implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceResource.java

@@ -4,21 +4,21 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * <p>
- * 角色系统资源关联表
+ * 系统资源关联表
  * </p>
  */
 @Data
 @TableName("sys_service_resource")
-@ApiModel(value="ServiceResource对象", description="角色系统资源关联表")
+@ApiModel(value="ServiceResource对象", description="系统资源关联表")
 public class ServiceResource implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -27,9 +27,9 @@ public class ServiceResource implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty(value = "角色系统编号")
-    @TableField("role_service_id")
-    private Long roleServiceId;
+    @ApiModelProperty(value = "系统编号")
+    @TableField("service_id")
+    private Long serviceId;
 
     @ApiModelProperty(value = "资源编号")
     @TableField("resource_id")
@@ -39,17 +39,29 @@ public class ServiceResource implements Serializable {
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/ServiceSet.java

@@ -4,11 +4,12 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -54,5 +55,25 @@ public class ServiceSet implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/SysService.java

@@ -31,18 +31,6 @@ public class SysService implements Serializable {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -51,5 +39,25 @@ public class SysService implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/User.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -71,17 +71,29 @@ public class User implements Serializable {
     @TableField("status")
     private String status;
 
-    @ApiModelProperty(value = "创建者编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "是否删除,N:未删除，Y:删除")
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/UserRole.java

@@ -4,9 +4,9 @@ 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 lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,18 +35,6 @@ public class UserRole implements Serializable {
     @TableField("role_id")
     private Long roleId;
 
-    @ApiModelProperty(value = "备注")
-    @TableField("remark")
-    private String remark;
-
-    @ApiModelProperty(value = "创建用户编号")
-    @TableField("creator")
-    private Long creator;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private Date createTime;
-
     @ApiModelProperty(value = "排序")
     @TableField("order_no")
     private String orderNo;
@@ -55,5 +43,25 @@ public class UserRole implements Serializable {
     @TableField("is_deleted")
     private String isDeleted;
 
+    @ApiModelProperty(value = "记录创建时间")
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间,如果时间是1970年则表示纪录未修改")
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    @ApiModelProperty(value = "创建人，0表示无创建人值")
+    @TableField("creator")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人,如果为0则表示纪录未修改")
+    @TableField("modifier")
+    private String modifier;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceMenuFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RoleServiceMenuServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色系统功能菜单关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RoleServiceMenuFacade extends RoleServiceMenuServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/RoleServiceResourceFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade;
+
+import com.lantone.dblayermbg.service.impl.RoleServiceResourceServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 角色系统资源关联表 服务实现类Facade
+ * </p>
+ */
+@Component
+public class RoleServiceResourceFacade extends RoleServiceResourceServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceMenuMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.RoleServiceMenu;
+
+/**
+ * <p>
+ * 角色系统功能菜单关联表 Mapper 接口
+ * </p>
+ */
+public interface RoleServiceMenuMapper extends BaseMapper<RoleServiceMenu> {
+
+}
+

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/RoleServiceResourceMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.RoleServiceResource;
+
+/**
+ * <p>
+ * 角色系统资源关联表 Mapper 接口
+ * </p>
+ */
+public interface RoleServiceResourceMapper extends BaseMapper<RoleServiceResource> {
+
+}
+

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceMenuService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleServiceMenu;
+
+/**
+ * <p>
+ * 角色系统功能菜单关联表 服务类
+ * </p>
+ */
+public interface RoleServiceMenuService extends IService<RoleServiceMenu> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/RoleServiceResourceService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.RoleServiceResource;
+
+/**
+ * <p>
+ * 角色系统资源关联表 服务类
+ * </p>
+ */
+public interface RoleServiceResourceService extends IService<RoleServiceResource> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceMenuServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleServiceMenu;
+import com.lantone.dblayermbg.mapper.RoleServiceMenuMapper;
+import com.lantone.dblayermbg.service.RoleServiceMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色系统功能菜单关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleServiceMenuServiceImpl extends ServiceImpl<RoleServiceMenuMapper, RoleServiceMenu> implements RoleServiceMenuService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/RoleServiceResourceServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.RoleServiceResource;
+import com.lantone.dblayermbg.mapper.RoleServiceResourceMapper;
+import com.lantone.dblayermbg.service.RoleServiceResourceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色系统资源关联表 服务实现类
+ * </p>
+ */
+@Service
+public class RoleServiceResourceServiceImpl extends ServiceImpl<RoleServiceResourceMapper, RoleServiceResource> implements RoleServiceResourceService {
+
+}

dblayer-mbg/src/main/resources/mapper/RoleServiceMenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMenuMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/RoleServiceResourceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceResourceMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDataAuthDetailMapper.xml

@@ -9,9 +9,12 @@
         <result column="data_type" property="dataType"/>
         <result column="detail_type" property="detailType"/>
         <result column="detail_id" property="detailId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDataAuthMapper.xml

@@ -9,9 +9,12 @@
         <result column="status" property="status"/>
         <result column="order_no" property="orderNo"/>
         <result column="hospital_id" property="hospitalId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDeptDoctorMapper.xml

@@ -8,10 +8,13 @@
         <result column="hospital_id" property="hospitalId"/>
         <result column="dept_id" property="deptId"/>
         <result column="doctor_id" property="doctorId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDeptMapper.xml

@@ -12,9 +12,12 @@
         <result column="spell" property="spell"/>
         <result column="station" property="station"/>
         <result column="order_no" property="orderNo"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDictionariesMapper.xml

@@ -11,6 +11,11 @@
         <result column="explain" property="explain"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseDoctorMapper.xml

@@ -10,9 +10,12 @@
         <result column="mobilePhone" property="mobilePhone"/>
         <result column="professor" property="professor"/>
         <result column="occup" property="occup"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseHospitalMapper.xml

@@ -6,16 +6,18 @@
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Hospital">
         <id column="id" property="id"/>
         <result column="parent_id" property="parentId"/>
-        <result column="org_code" property="orgCode"/>
-        <result column="parent_code" property="parentCode"/>
+        <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="region" property="region"/>
         <result column="type" property="type"/>
         <result column="order_no" property="orderNo"/>
         <result column="status" property="status"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseHospitalUserMapper.xml

@@ -7,9 +7,12 @@
         <id column="id" property="id"/>
         <result column="hospital_id" property="hospitalId"/>
         <result column="user_id" property="userId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseLogMapper.xml

@@ -13,9 +13,13 @@
         <result column="method" property="method"/>
         <result column="params" property="params"/>
         <result column="exception" property="exception"/>
-        <result column="create_date" property="createDate"/>
         <result column="operator" property="operator"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseLoginLogMapper.xml

@@ -11,8 +11,12 @@
         <result column="login_status" property="loginStatus"/>
         <result column="login_ip" property="loginIp"/>
         <result column="login_browser" property="loginBrowser"/>
-        <result column="remark" property="remark"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseMedoupDoctorMapper.xml

@@ -8,9 +8,12 @@
         <result column="hospital_id" property="hospitalId"/>
         <result column="dept_id" property="deptId"/>
         <result column="dcotor_id" property="dcotorId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseMedoupMapper.xml

@@ -9,9 +9,12 @@
         <result column="dept_id" property="deptId"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseMenuMapper.xml

@@ -14,10 +14,12 @@
         <result column="order_no" property="orderNo"/>
         <result column="status" property="status"/>
         <result column="describe" property="describe"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseMenuResourceMapper.xml

@@ -7,11 +7,13 @@
         <id column="id" property="id"/>
         <result column="menu_id" property="menuId"/>
         <result column="resource_id" property="resourceId"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRegionDeptMapper.xml

@@ -8,11 +8,13 @@
         <result column="hospital_id" property="hospitalId"/>
         <result column="region_id" property="regionId"/>
         <result column="dept_id" property="deptId"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRegionMapper.xml

@@ -11,9 +11,12 @@
         <result column="spell" property="spell"/>
         <result column="station" property="station"/>
         <result column="order_no" property="orderNo"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseResourceMapper.xml

@@ -11,10 +11,12 @@
         <result column="order_no" property="orderNo"/>
         <result column="status" property="status"/>
         <result column="describe" property="describe"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleMapper.xml

@@ -6,13 +6,15 @@
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.Role">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
-        <result column="remark" property="remark"/>
         <result column="status" property="status"/>
         <result column="hospital_id" property="hospitalId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceDataAuthMapper.xml

@@ -7,9 +7,12 @@
         <id column="id" property="id"/>
         <result column="role_id" property="roleId"/>
         <result column="service_data_auth_id" property="serviceDataAuthId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceMenuMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceMenuMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleServiceMenu">
+        <id column="id" property="id"/>
+        <result column="role_id" property="roleId"/>
+        <result column="service_menu_id" property="serviceMenuId"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseRoleServiceResourceMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.RoleServiceResourceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.RoleServiceResource">
+        <id column="id" property="id"/>
+        <result column="role_id" property="roleId"/>
+        <result column="service_resource_id" property="serviceResourceId"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceDataAuthMapper.xml

@@ -7,9 +7,12 @@
         <id column="id" property="id"/>
         <result column="service_id" property="serviceId"/>
         <result column="data_auth_id" property="dataAuthId"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceMenuMapper.xml

@@ -5,12 +5,15 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.ServiceMenu">
         <id column="id" property="id"/>
-        <result column="role_service_id" property="roleServiceId"/>
+        <result column="service_id" property="serviceId"/>
         <result column="menu_id" property="menuId"/>
         <result column="order_no" property="orderNo"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceResourceMapper.xml

@@ -5,12 +5,15 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.ServiceResource">
         <id column="id" property="id"/>
-        <result column="role_service_id" property="roleServiceId"/>
+        <result column="service_id" property="serviceId"/>
         <result column="resource_id" property="resourceId"/>
         <result column="order_no" property="orderNo"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseServiceSetMapper.xml

@@ -12,6 +12,11 @@
         <result column="explain" property="explain"/>
         <result column="describe" property="describe"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseSysServiceMapper.xml

@@ -6,11 +6,13 @@
     <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.SysService">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseUserMapper.xml

@@ -16,9 +16,12 @@
         <result column="job_no" property="jobNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="status" property="status"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/main/resources/mapper/base/BaseUserRoleMapper.xml

@@ -7,11 +7,13 @@
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="role_id" property="roleId"/>
-        <result column="remark" property="remark"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
         <result column="order_no" property="orderNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 </mapper>

dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -20,12 +20,12 @@ public class CodeAutoGenerator {
      * 表名
      */
     private static String[] TABLES = {
-            "sys_data_auth_detail"
+            "sys_service"
     };
     /**
      * 生成的实体类忽略表前缀: 不需要则置空
      */
-    private static String[] ENTITY_IGNORE_PREFIX = { "sys_" };
+    private static String[] ENTITY_IGNORE_PREFIX = { "" };
 
     public static void main(String[] args) {
         GeneratorUtil.create(username, password, url, TABLES, ENTITY_IGNORE_PREFIX);

security-center/src/main/java/com/lantone/security/facade/DataAuthHandleFacade.java

@@ -224,8 +224,8 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
         DataAuth dataAuth = new DataAuth();
         //        dataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
         BeanUtils.copyProperties(serviceDataAuthVO.getDataAuthVO(), dataAuth);
-        dataAuth.setCreateTime(DateUtil.now());
-        dataAuth.setCreator(1l);
+        dataAuth.setGmtCreate(DateUtil.now());
+        dataAuth.setCreator("1");
         boolean dataAuthInsert = dataAuthFacade.save(dataAuth);
         if (dataAuthInsert) {
             //2.插入成功获取新生成的数据权限名称编号data_auth_id
@@ -256,8 +256,8 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
             ServiceDataAuth serviceDataAuth = new ServiceDataAuth();
             serviceDataAuth.setServiceId(sysServiceVO.getId());
             serviceDataAuth.setDataAuthId(dataAuthId);
-            serviceDataAuth.setCreateTime(DateUtil.now());
-            serviceDataAuth.setCreator(1l);
+            serviceDataAuth.setGmtCreate(DateUtil.now());
+            serviceDataAuth.setCreator("1");
             //                serviceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
             boolean serviceDataAuthInsert = serviceDataAuthFacade.save(serviceDataAuth);
             if (serviceDataAuthInsert) {
@@ -272,8 +272,8 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
                     RoleServiceDataAuth roleServiceDataAuth = new RoleServiceDataAuth();
                     roleServiceDataAuth.setRoleId(role.getId());
                     roleServiceDataAuth.setServiceDataAuthId(serviceDataAuthId);
-                    roleServiceDataAuth.setCreateTime(DateUtil.now());
-                    roleServiceDataAuth.setCreator(1l);
+                    roleServiceDataAuth.setGmtCreate(DateUtil.now());
+                    roleServiceDataAuth.setCreator("1");
                     //                        roleServiceDataAuth.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
                     if (!roleServiceDataAuthFacade.save(roleServiceDataAuth)) {
                         Asserts.fail("角色对应服务数据权限关系插入失败");
@@ -285,8 +285,8 @@ public class DataAuthHandleFacade extends DataAuthServiceImpl {
                     DataAuthDetail dataAuthDetail = new DataAuthDetail();
                     BeanUtils.copyProperties(dataAuthDetailVO, dataAuthDetail);
                     //                        dataAuthDetail.setCreator(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
-                    dataAuthDetail.setCreator(1l);
-                    dataAuthDetail.setCreateTime(DateUtil.now());
+                    dataAuthDetail.setGmtCreate(DateUtil.now());
+                    dataAuthDetail.setCreator("1");
                     dataAuthDetail.setServiceDataAuthId(serviceDataAuthId);
                     if (!dataAuthDetailFacade.save(dataAuthDetail)) {
                         Asserts.fail("数据权限明细插入失败");