From 94ca59e0256029c7dcce39e0fc092eb637a7b12c Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 19 Jan 2021 22:17:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E5=B7=AE=E5=BC=82=E5=8C=96=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=EF=BC=8C=E4=BA=BA=E6=80=A7?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=80=9A=E7=94=A8=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jeesite/modules/msg/entity/MsgInner.java | 2 +- .../java/com/jeesite/modules/msg/entity/MsgInnerRecord.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/Area.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/Company.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/EmpUser.java | 2 +- .../main/java/com/jeesite/modules/sys/entity/Employee.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/Log.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/Office.java | 2 +- .../src/main/java/com/jeesite/modules/sys/entity/Post.java | 2 +- .../src/main/resources/templates/modules/gen/crud/entity.xml | 2 +- .../resources/templates/modules/gen/crud_cloud/entity.xml | 2 +- .../core/src/main/resources/views/modules/sys/logForm.html | 4 ++++ 12 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java index faed61fb..cbb587b0 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java @@ -21,7 +21,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2019-03-12 */ -@Table(name="${_prefix}sys_msg_inner", alias="a", columns={ +@Table(name="${_prefix}sys_msg_inner", alias="a", label="内部消息", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), @Column(name="msg_title", attrName="msgTitle", label="消息标题", queryType=QueryType.LIKE), @Column(name="content_level", attrName="contentLevel", label="内容等级", comment="内容等级（1普通 2一般 3紧急）"), diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java index c4adf6f3..33cd81ec 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java @@ -20,7 +20,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2019-03-12 */ -@Table(name="${_prefix}sys_msg_inner_record", alias="a", columns={ +@Table(name="${_prefix}sys_msg_inner_record", alias="a", label="消息发送记录", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), @Column(name="msg_inner_id", attrName="msgInnerId", label="所属消息"), @Column(name="receive_user_code", attrName="receiveUserCode", label="接受者用户编码"), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java index 17bdb6ff..3e174663 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java @@ -17,7 +17,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2017-03-22 */ -@Table(name="${_prefix}sys_area", alias="a", columns={ +@Table(name="${_prefix}sys_area", alias="a", label="区域信息", columns={ @Column(includeEntity=DataEntity.class), @Column(includeEntity=TreeEntity.class), @Column(name="area_code", attrName="areaCode", label="区域代码", isPK=true), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java index 22f51e2a..afb4a638 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java @@ -28,7 +28,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2017-03-23 */ -@Table(name="${_prefix}sys_company", alias="a", columns={ +@Table(name="${_prefix}sys_company", alias="a", label="公司信息", columns={ @Column(includeEntity=BaseEntity.class), @Column(includeEntity=DataEntity.class), @Column(includeEntity=TreeEntity.class), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index d4b3c252..95001931 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -25,7 +25,7 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType; * @author ThinkGem * @version 2017-03-25 */ -@Table(name="${_prefix}sys_user", alias="a", columns={ +@Table(name="${_prefix}sys_user", alias="a", label="员工信息", columns={ @Column(includeEntity=User.class), }, joinTable={ @JoinTable(type=Type.JOIN, entity=Employee.class, alias="e", diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java index 4b214949..9cd6d4ed 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java @@ -24,7 +24,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2017-03-25 */ -@Table(name="${_prefix}sys_employee", alias="a", columns={ +@Table(name="${_prefix}sys_employee", alias="a", label="员工信息", columns={ @Column(includeEntity=BaseEntity.class), @Column(includeEntity=DataEntity.class), @Column(name="emp_code", attrName="empCode", label="员工编码", isPK=true), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 52a4d051..1d7bbac5 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -25,7 +25,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; * @author ThinkGem * @version 2017-03-19 */ -@Table(name="${_prefix}sys_log", alias="a", columns={ +@Table(name="${_prefix}sys_log", alias="a", label="操作日志", columns={ @Column(includeEntity=BaseEntity.class), @Column(name="id", attrName="id", label="编码", isPK=true), @Column(name="log_type", attrName="logType", label="日志类型"), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java index 636ef5af..1a8d278b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java @@ -23,7 +23,7 @@ import com.jeesite.modules.sys.utils.EmpUtils; * @author ThinkGem * @version 2017-03-23 */ -@Table(name="${_prefix}sys_office", alias="a", columns={ +@Table(name="${_prefix}sys_office", alias="a", label="组织机构", columns={ @Column(includeEntity=BaseEntity.class), @Column(includeEntity=DataEntity.class), @Column(includeEntity=TreeEntity.class), diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index 735a4c4a..016b3885 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -12,7 +12,7 @@ import com.jeesite.common.mybatis.annotation.Column; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; -@Table(name="${_prefix}sys_post", alias="a", columns={ +@Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={ @Column(includeEntity=BaseEntity.class), @Column(includeEntity=DataEntity.class), @Column(name="post_code", attrName="postCode", label="岗位编码", isPK=true), diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml index b285f9ae..bd02ee6c 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml @@ -34,7 +34,7 @@ import com.jeesite.modules.bpm.entity.BpmEntity; * @author ${functionAuthor} * @version ${functionVersion} */ -@Table(name="${table.genTableName}", alias="a", columns={ +@Table(name="${table.genTableName}", alias="a", label="${functionNameSimple}信息", columns={ <% var isBase = false, isData = false, isTree = false, isExtend = false; diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml index fd97cc1a..2d34af33 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml @@ -34,7 +34,7 @@ import com.jeesite.modules.bpm.entity.BpmEntity; * @author ${functionAuthor} * @version ${functionVersion} */ -@Table(name="${table.genTableName}", alias="a", columns={ +@Table(name="${table.genTableName}", alias="a", label="${functionNameSimple}信息", columns={ <% var isBase = false, isData = false, isTree = false, isExtend = false; diff --git a/modules/core/src/main/resources/views/modules/sys/logForm.html b/modules/core/src/main/resources/views/modules/sys/logForm.html index 36316e8b..60bf9422 100644 --- a/modules/core/src/main/resources/views/modules/sys/logForm.html +++ b/modules/core/src/main/resources/views/modules/sys/logForm.html @@ -184,6 +184,10 @@ <% } %> +