From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +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/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..806751e 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,18 +19,19 @@
@Builder
public class SuMaterialWarehouseEntity {
- private Integer id;
+ private String id;
private Integer tableNum;//桌号
-
+ private String nameOfOrigin;//场地名称
private String materialName;//物料名称
- private Integer incomingQuantity;//进厂数量
+ private Double incomingQuantity;//进厂数量
private Date createTime;//创建时间
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