From 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b Mon Sep 17 00:00:00 2001 From: 张晓波 <bingbo1993@126.com> Date: 星期一, 11 十二月 2023 10:38:37 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java index 3decc8b..e2ed314 100644 --- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java +++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java @@ -30,8 +30,8 @@ /** * 预埋件类型 字典 */ - @Excel(sort = 3,title = "类型") private String embedmentType; + @Excel(sort = 3,title = "类型") private String dictName; /** @@ -79,7 +79,6 @@ */ private String createUser; - @Excel(sort = 5,title = "备注") private String remark; private String companyId; @@ -87,7 +86,7 @@ * This field was generated by MyBatis Generator. * This field corresponds to the database table sys_assist_good * - * @mbg.generated Tue Apr 11 08:58:47 CST 2023 + * @mbg.generated Tue AembedmentInsetRecord/embedmentRecordListpr 11 08:58:47 CST 2023 */ private static final long serialVersionUID = 1L; -- Gitblit v1.9.3