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/SysEmbedmentRecordEntity.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
index f361673..bfe9790 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
@@ -29,9 +29,10 @@
//预埋件名称
private String embedmentName;
//预埋件规格
+ @Excel(sort = 1,title = "规格型号")
private String embedmentModel;
- @Excel(sort = 1,title = "预埋件名称")
+ @Excel(sort = 0,title = "预埋件名称")
private String embedmentNameAndModel;
public String getEmbedmentNameAndModel() {
@@ -46,7 +47,7 @@
/**
* 出库量/入库量
*/
- @Excel(sort = 2,title = "数量")
+ @Excel(sort = 2,title = "入库数量")
private Integer changeStock;
/**
@@ -90,6 +91,7 @@
/**
* 入库时间
*/
+ @Excel(sort = 6,title = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
--
Gitblit v1.9.3