diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index ff8c3555a..27f61bfe9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -70,7 +70,7 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String attestationPlan; /**创建人*/ - private java.lang.String createUserId; + private java.lang.String createBy; @TableField(exist = false) private java.lang.String createUserName; @@ -80,7 +80,7 @@ public class ProjectLibraryBase implements Serializable { private java.util.Date createTime; /**更新人*/ - private java.lang.String updateUserId; + private java.lang.String updateBy; @TableField(exist = false) private java.lang.String updateUserName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index bbfb9df16..7751ac096 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -63,7 +63,7 @@ public class ProjectRelatedPersonnel implements Serializable { private java.lang.String remark; /**创建人*/ - private java.lang.String createUserId; + private java.lang.String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -71,7 +71,7 @@ public class ProjectRelatedPersonnel implements Serializable { private java.util.Date createTime; /**更新人*/ - private java.lang.String updateUserId; + private java.lang.String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index e3a07ba6d..e8406aa03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -14,9 +14,9 @@ - + - + @@ -36,18 +36,13 @@ plb.ipd_info, plb.vehicle_development_plan, plb.attestation_plan, - plb.create_user_id, - createuser.username as create_user_name, + plb.create_by, plb.create_time, - plb.update_user_id, - updateuser.username as update_user_name, + plb.update_by, plb.update_time from project_library_base as plb left join project_name_info as pni on plb.project_name=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id - left join sys_user as createuser on plb.create_user_id=createuser.id - left join sys_user as updateuser on plb.update_user_id=updateuser.id - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index f9c406904..ca28d3a3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -54,8 +54,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl