From 18c35e5010d11a49a4ce4f346e760a9bd1988c6c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 18 八月 2023 18:56:25 +0800
Subject: [PATCH] 调整粮情打印错误
---
igds-core/src/main/java/com/ld/igds/models/Depot.java | 1 +
igds-web/src/main/resources/static/admin/grain/grain-export.js | 2 +-
igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java | 6 ++----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
index ce5f0f7..378fd9d 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/controller/PestController.java
@@ -135,10 +135,8 @@
/**
*
- * @param depotId
- * 浠撳簱缂栫爜
- * @param checkDate
- * 鐩戞祴鏃堕棿
+ * @param param
+ * 鍙傛暟
* @return
*/
@RequestMapping(value = "/flush-pest")
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index 8f92fd0..3467c9b 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -119,6 +119,7 @@
@Column(name = "STORE_DATE_")
@PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date storeDate;
@Column(name = "CHECK_DATE_")
diff --git a/igds-web/src/main/resources/static/admin/grain/grain-export.js b/igds-web/src/main/resources/static/admin/grain/grain-export.js
index 229beef..80ade79 100644
--- a/igds-web/src/main/resources/static/admin/grain/grain-export.js
+++ b/igds-web/src/main/resources/static/admin/grain/grain-export.js
@@ -7,7 +7,7 @@
area: ['730px', '450px'],
shade: 0,
content: $('#batchExportSelect'),
- btn: ['鍏ㄩ��', '鍙嶉��', '閲嶉��', '鎵ц瀵煎嚭', '鍙栨秷鎵撳嵃'],
+ btn: ['鍏ㄩ��', '鍙嶉��', '閲嶉��', '鎵ц瀵煎嚭', '鍙栨秷瀵煎嚭'],
yes: function () {
var name;
$('#batchExportSelect input').each(function () {
--
Gitblit v1.9.3