From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积

---
 src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
index d342f3d..f438535 100644
--- a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
+++ b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityVO.java
@@ -1,7 +1,11 @@
 package org.springblade.modules.traceability.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springblade.modules.traceability.entity.Traceability;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 溯源码表VO
@@ -16,4 +20,20 @@
 	 * 农场id
 	 */
 	private String farmId;
+
+	/**
+	 * 地块 id
+	 */
+	private String landId;
+
+	private String landName;
+
+	private String url;
+
+	private String strainName;
+
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date recoveryTime;
+
 }

--
Gitblit v1.9.3