From 585863b324f5c30601df1c1418ee733854e89a15 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 13 May 2022 08:49:51 +0800
Subject: [PATCH] 农资管理

---
 src/main/java/org/springblade/modules/stock/entity/Stock.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/entity/Stock.java b/src/main/java/org/springblade/modules/stock/entity/Stock.java
index 3c3d70f..d1b4f8d 100644
--- a/src/main/java/org/springblade/modules/stock/entity/Stock.java
+++ b/src/main/java/org/springblade/modules/stock/entity/Stock.java
@@ -19,9 +19,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 农资库存表实体类
@@ -39,11 +45,11 @@
 	/**
 	* 农资ID
 	*/
-		private String stockId;
+	private String stockId;
 	/**
 	* 规格
 	*/
-		private Double specs;
+		private String specs;
 	/**
 	* 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
 	*/
@@ -63,7 +69,9 @@
 	/**
 	* 入库时间
 	*/
-		private LocalDateTime time;
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date time;
 	/**
 	* 图片
 	*/
@@ -76,6 +84,8 @@
 	* 状态 （0：有库存 1：没有库存）
 	*/
 		private String state;
+		private String sp1;
+		private String sp2;
 
 
 }

--
Gitblit v1.9.3