From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

---
 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