From 979c7c817b2e7d2430ac447b10f943c12dac3b64 Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期四, 26 十月 2023 11:32:01 +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 | 7 +++++-- 1 files changed, 5 insertions(+), 2 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..3decc8b 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,6 +30,7 @@ /** * 预埋件类型 字典 */ + @Excel(sort = 3,title = "类型") private String embedmentType; 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; /** -- Gitblit v1.9.3