From fecaf0050852d71e42444e2216a8844474f0de29 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 10 四月 2026 14:18:20 +0800
Subject: [PATCH] fix: 1.储丝单柜卷包产量处理包装机换班后产量不清零导致重复计算问题(2026.04.04后数据新增dac_up_time生效)  2.前端请求超时时间修改为20s

---
 TimescaleDB-Utils/src/main/java/com/shlb/timescaledbutils/entity/FeedmatchTimeData.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/TimescaleDB-Utils/src/main/java/com/shlb/timescaledbutils/entity/FeedmatchTimeData.java b/TimescaleDB-Utils/src/main/java/com/shlb/timescaledbutils/entity/FeedmatchTimeData.java
index f5e65ed..1211640 100755
--- a/TimescaleDB-Utils/src/main/java/com/shlb/timescaledbutils/entity/FeedmatchTimeData.java
+++ b/TimescaleDB-Utils/src/main/java/com/shlb/timescaledbutils/entity/FeedmatchTimeData.java
@@ -27,11 +27,6 @@
     private String key;
 
     /**
-     * 鏁版嵁鏇存柊鏃堕棿 鏍煎紡锛�'2024-11-29 09:13:43'
-     */
-    private String dacUpTime;
-
-    /**
      * 1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖
      */
     private String fs11;
@@ -145,4 +140,10 @@
      * 璁惧鍙� (3浣嶆暟瀛�)
      */
     private Integer equNo;
+
+
+    /**
+     * 鏁版嵁鏇存柊鏃堕棿
+     */
+    private Date DacUpTime;
 }

--
Gitblit v1.9.3