From 234fa7f56e0cf3c86dcf56fe0ba628360e1758f4 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 26 十月 2023 13:38:01 +0800
Subject: [PATCH] 20231026_qiuyh_调整预埋件导出
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java | 6 ++++--
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java | 5 ++---
2 files changed, 6 insertions(+), 5 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;
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