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/remote/entity/Remote.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/remote/entity/Remote.java b/src/main/java/org/springblade/modules/remote/entity/Remote.java
index 48f1033..eab2ef4 100644
--- a/src/main/java/org/springblade/modules/remote/entity/Remote.java
+++ b/src/main/java/org/springblade/modules/remote/entity/Remote.java
@@ -51,8 +51,8 @@
 	/**
 	 * 遥感时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM")
 	private Date reTime;
 	/**
 	 * 是否展示
@@ -72,6 +72,9 @@
 	 * 图片
 	 */
 	private String reTp;
-
+	/**
+	 * 0麻姑米集团、1水龙米业、2有机基地、3绿色基地、4育秧中心
+	 */
+	private Integer type;
 
 }

--
Gitblit v1.9.3