diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml
index 5dc4302..30bb1b6 100644
--- a/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml
+++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml
@@ -9,16 +9,17 @@
-
-
-
+
+
+
+
- ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId
+ ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, IFDEL AS ifdel, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml
index 117692c..aafe32f 100644
--- a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml
+++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml
@@ -13,10 +13,7 @@
-
-
-
@@ -28,10 +25,14 @@
+
+
+
+
- ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile
+ ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, IFDEL AS ifdel, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
diff --git a/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml
index aa995cd..3fd72fa 100644
--- a/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml
+++ b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml
@@ -12,11 +12,8 @@
-
-
-
@@ -27,10 +24,14 @@
+
+
+
+
- ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt
+ ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, IFDEL AS ifdel, ENABLE AS enable, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt,CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java
index 547bdac..80e5006 100644
--- a/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java
+++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java
@@ -24,7 +24,7 @@ public class Departments implements Serializable {
public Departments() {
this.id = StrUtils.uuid();
this.ifdel = ValidityEnum.VALIDITY.getValidity();
- this.created = new Date();
+ this.createTime = new Date();
}
/**
@@ -55,24 +55,9 @@ public class Departments implements Serializable {
/**
*
*/
- @TableField(value = "PUBLISH_ID")
- private String publishId;
- /**
- *
- */
@TableField(value = "IFDEL")
private Integer ifdel;
/**
- *
- */
- @TableField(value = "MODIFIED")
- private Date modified;
- /**
- *
- */
- @TableField(value = "CREATED")
- private Date created;
- /**
* 简码
*/
@TableField(value = "SHORT_CODE")
@@ -82,6 +67,27 @@ public class Departments implements Serializable {
*/
@TableField(value = "FOREIGN_ID")
private String foreignId;
+
+ /**
+ *
+ */
+ @TableField(value = "CREATE_ID")
+ private String createId;
+ /**
+ *
+ */
+ @TableField(value = "CREATE_TIME")
+ private Date createTime;
+ /**
+ *
+ */
+ @TableField(value = "MODIFY_ID")
+ private String modifyId;
+ /**
+ *
+ */
+ @TableField(value = "MODIFY_TIME")
+ private Date modifyTime;
public String getId() {
return id;
@@ -123,14 +129,6 @@ public class Departments implements Serializable {
this.description = description;
}
- public String getPublishId() {
- return publishId;
- }
-
- public void setPublishId(String publishId) {
- this.publishId = publishId;
- }
-
public Integer getIfdel() {
return ifdel;
}
@@ -139,23 +137,39 @@ public class Departments implements Serializable {
this.ifdel = ifdel;
}
- public Date getModified() {
- return modified;
- }
+ public String getCreateId() {
+ return createId;
+ }
- public void setModified(Date modified) {
- this.modified = modified;
- }
+ public void setCreateId(String createId) {
+ this.createId = createId;
+ }
- public Date getCreated() {
- return created;
- }
+ public Date getCreateTime() {
+ return createTime;
+ }
- public void setCreated(Date created) {
- this.created = created;
- }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getModifyId() {
+ return modifyId;
+ }
+
+ public void setModifyId(String modifyId) {
+ this.modifyId = modifyId;
+ }
+
+ public Date getModifyTime() {
+ return modifyTime;
+ }
+
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
- public String getShortCode() {
+ public String getShortCode() {
return shortCode;
}
diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java
index 5920999..54685b1 100644
--- a/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java
+++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java
@@ -65,26 +65,11 @@ public class Organizations implements Serializable {
@TableField(value="DESCRIPTION")
private String description;
/**
- * 发布人ID
- */
- @TableField(value="PUBLISH_ID")
- private String publishId;
- /**
* 1：有效，2：无效
*/
@TableField(value="IFDEL")
private Integer ifdel;
/**
- * 最后修改时间
- */
- @TableField(value="MODIFIED")
- private Date modified;
- /**
- * 创建时间
- */
- @TableField(value="CREATED")
- private Date created;
- /**
*
*/
@TableField(value="FOREIGN_ID")
@@ -139,6 +124,27 @@ public class Organizations implements Serializable {
*/
@TableField(value="MOBILE")
private String mobile;
+
+ /**
+ *
+ */
+ @TableField(value = "CREATE_ID")
+ private String createId;
+ /**
+ *
+ */
+ @TableField(value = "CREATE_TIME")
+ private Date createTime;
+ /**
+ *
+ */
+ @TableField(value = "MODIFY_ID")
+ private String modifyId;
+ /**
+ *
+ */
+ @TableField(value = "MODIFY_TIME")
+ private Date modifyTime;
public String getId() {
@@ -213,13 +219,6 @@ public class Organizations implements Serializable {
this.description = description;
}
- public String getPublishId() {
- return publishId;
- }
-
- public void setPublishId(String publishId) {
- this.publishId = publishId;
- }
public Integer getIfdel() {
return ifdel;
@@ -229,23 +228,39 @@ public class Organizations implements Serializable {
this.ifdel = ifdel;
}
- public Date getModified() {
- return modified;
- }
+ public String getCreateId() {
+ return createId;
+ }
- public void setModified(Date modified) {
- this.modified = modified;
- }
+ public void setCreateId(String createId) {
+ this.createId = createId;
+ }
- public Date getCreated() {
- return created;
- }
+ public Date getCreateTime() {
+ return createTime;
+ }
- public void setCreated(Date created) {
- this.created = created;
- }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getModifyId() {
+ return modifyId;
+ }
+
+ public void setModifyId(String modifyId) {
+ this.modifyId = modifyId;
+ }
+
+ public Date getModifyTime() {
+ return modifyTime;
+ }
+
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
- public String getForeignId() {
+ public String getForeignId() {
return foreignId;
}