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

---
 RuoYi-Vue-Plus/ruoyi-admin/pom.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-admin/pom.xml b/RuoYi-Vue-Plus/ruoyi-admin/pom.xml
index 25600a1..f16c7a1 100755
--- a/RuoYi-Vue-Plus/ruoyi-admin/pom.xml
+++ b/RuoYi-Vue-Plus/ruoyi-admin/pom.xml
@@ -25,15 +25,15 @@
 
 <!--        &lt;!&ndash; mp鏀寔鐨勬暟鎹簱鍧囨敮鎸� 鍙渶瑕佸鍔犲搴旂殑jdbc渚濊禆鍗冲彲 &ndash;&gt;-->
 <!--        &lt;!&ndash; Oracle &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.oracle.database.jdbc</groupId>-->
-<!--            <artifactId>ojdbc8</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+        </dependency>
 <!--        &lt;!&ndash; 鍏煎oracle浣庣増鏈� &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.oracle.database.nls</groupId>-->
-<!--            <artifactId>orai18n</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
+        </dependency>
         <!-- PostgreSql -->
         <dependency>
             <groupId>org.postgresql</groupId>

--
Gitblit v1.9.3