From ca9495a46e25f1a4cf1fea0cff3461b3d7e83221 Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Tue, 15 Nov 2022 11:10:29 +0800 Subject: [PATCH] 2022-11-15 --- .../src/views/zystyleaccessories/ZyStyleAccessoriesList.vue | 2 +- .../views/zystyleaccessories/modules/ZyAccessoriesList.vue | 4 ++-- .../jeecg/modules/demo/accessories/entity/ZyAccessories.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue index 31cf5d2e..100a1fa7 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue @@ -149,7 +149,7 @@ dataIndex: 'styleId_dictText' }, { - title:'辅料类型', + title:'辅料名称', align:"center", dataIndex: 'accessoriesId_dictText' }, diff --git a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue index 640fbe0a..72441302 100644 --- a/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/zystyleaccessories/modules/ZyAccessoriesList.vue @@ -87,9 +87,9 @@ } }, { - title:'类型id', + title:'类型', align:"center", - dataIndex: 'typeId' + dataIndex: 'typeId_dictText' }, { title:'编号', diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java index 33108fbf..8d718db0 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java @@ -38,6 +38,7 @@ public class ZyAccessories implements Serializable { /**类型id*/ @Excel(name = "类型id", width = 15) @ApiModelProperty(value = "类型id") + @Dict(dictTable = "zy_accessories_type", dicText = "contents", dicCode = "id") private java.lang.String typeId; /**编号*/ @Excel(name = "编号", width = 15)