From 2d8dafdddd85653371e463ee43f960f2366d9313 Mon Sep 17 00:00:00 2001 From: 李旭东 <woaiguo66@sina.com> Date: 星期五, 27 十月 2023 15:51:16 +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 | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 6cd094c..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 @@ -31,6 +31,7 @@ * 预埋件类型 字典 */ private String embedmentType; + @Excel(sort = 3,title = "类型") private String dictName; /** @@ -42,23 +43,25 @@ /** * 计量单位 */ - @Excel(sort = 3,title = "计量单位") + @Excel(sort = 4,title = "计量单位") private String unit; /** * 库存数量 */ + @Excel(sort = 5,title = "库存数量") private Integer stock; /** * 位置 */ - @Excel(sort = 4,title = "位置") + @Excel(sort = 7,title = "位置") private String position; /** * 报警数量 */ + @Excel(sort = 6,title = "报警数") private Integer alarmCount; /** @@ -76,7 +79,6 @@ */ private String createUser; - @Excel(sort = 5,title = "备注") private String remark; private String companyId; @@ -84,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