From 60863b0d75409da6ba7f187fb42319e8a052fbfc Mon Sep 17 00:00:00 2001 From: itcast Date: Wed, 19 Jul 2023 16:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89excel=E8=A1=A8=E9=87=8Cid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/mixins/JeecgListMixin.js | 2 +- .../modules/demo/requirementtype/entity/RequirementType.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js index 4d360d3..c4362d2 100644 --- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js @@ -349,7 +349,7 @@ export const JeecgListMixin = { this.$refs.modalForm.edit(record); this.$refs.modalForm.title = "复制"; this.$refs.modalForm.disableSubmit = false; - // 新增/修改 成功时，重载列表 + // 重载列表 this.loadData(); }, // 任务管理-任务-分解 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/entity/RequirementType.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/entity/RequirementType.java index 3a76744..65e445f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/entity/RequirementType.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementtype/entity/RequirementType.java @@ -57,12 +57,12 @@ public class RequirementType implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; /**项目id*/ - @Excel(name = "项目id", width = 15, dictTable = "projectx", dicText = "project_name", dicCode = "id") + @Excel(name = "项目", width = 15, dictTable = "projectx", dicText = "project_name", dicCode = "id") @Dict(dictTable = "projectx", dicText = "project_name", dicCode = "id") @ApiModelProperty(value = "项目id") private java.lang.String projectId; /**上级类型id*/ - @Excel(name = "上级类型id", width = 15, dictTable = "requirement_type", dicText = "type_name", dicCode = "id") + @Excel(name = "上级类型", width = 15, dictTable = "requirement_type", dicText = "type_name", dicCode = "id") @Dict(dictTable = "requirement_type", dicText = "type_name", dicCode = "id") @ApiModelProperty(value = "上级类型id") private java.lang.String upperId;