From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改

---
 src/main/java/org/springblade/modules/traceability/entity/Traceability.java |   68 ++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
index eb62b8a..c47a861 100644
--- a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
+++ b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
@@ -24,7 +24,47 @@
 	 * 主键id
 	 */
 	@TableId(value = "id",type = IdType.AUTO)
-	private Integer id;
+	private Long id;
+
+	/**
+	 * 商品名称
+	 */
+	private String productName;
+
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+
+	/**
+	 * 产地
+	 */
+	private String place;
+
+
+	/**
+	 * 合格证编号
+	 */
+	private String certificationCode;
+
+
+	/**
+	 * 承诺依据 0:委托检测 1:自我检测 2:内部质量控制 3:自我承诺
+	 */
+	private String according;
+
+
+	/**
+	 * 创建时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	/**
+	 * 重量
+	 */
+	private String weight;
 
 	/**
 	 * 溯源码编号
@@ -41,22 +81,20 @@
 	 */
 	private String print;
 
-
 	/**
-	 * 溯源码图片url
-	 */
-	private String url;
-
-	/**
-	 * 创建时间
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
-
-	/**
-	 * 采收id(溯源id)
+	 * 采收记录id
 	 */
 	private Integer recoveryId;
 
+	/**
+	 * 单位id
+	 */
+	private String deptId;
+
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+
 }

--
Gitblit v1.9.3