From 29a6e997b69d55b31d37810ff973a613924ddfa9 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 16 十一月 2023 09:51:59 +0800
Subject: [PATCH] 20231116_qiuyh_料仓大屏

---
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
index 03e9161..606c4c6 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
@@ -1,5 +1,6 @@
 package com.thhy.materials.modules.biz.suMaterialWarehouse.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,10 +19,10 @@
 @Builder
 public class SuMaterialWarehouseEntity {
 
-	private Integer id;
+	private String id;
 
 	private Integer tableNum;//桌号
-
+	private String nameOfOrigin;//场地名称
 	private String materialName;//物料名称
 
 	private Integer incomingQuantity;//进厂数量
@@ -30,6 +31,7 @@
 
 	private Integer status;//检验状态
 
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date inspectionDate;//检验日期
 
 	private String reportNumber;//报告编号
@@ -44,6 +46,7 @@
 
 	private String companyId;
 
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date inTime;//进厂日期
 
 	private Integer type;//入库方式 1手动 2自动

--
Gitblit v1.9.3