From 8a481b7c26961df9704dedb6d83165a38123e484 Mon Sep 17 00:00:00 2001
From: lagos <627844378@qq.com>
Date: Tue, 20 Jan 2026 09:59:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml        |  8 ++++----
 .../com/ruoyi/plc/common/domain/PlcGvlCommon.java     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a5f438e..09ee592 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -68,15 +68,15 @@ spring:
   data:
     # redis 配置
     redis:
-      host: ngtools.cn
-      #host: 10.75.166.165
+#      host: ngtools.cn
+      host: 10.75.166.165
       # 端口，默认为6379
       port: 6379
       # 数据库索引
       database: 0
       # 密码
-      #password: Cxc@2024!1121
-      password: 4877017Ldy
+      password: Cxc@2024!1121
+#      password: 4877017Ldy
       # 连接超时时间
       timeout: 10s
       lettuce:
diff --git a/ruoyi-production/src/main/java/com/ruoyi/plc/common/domain/PlcGvlCommon.java b/ruoyi-production/src/main/java/com/ruoyi/plc/common/domain/PlcGvlCommon.java
index 6dc0b69..b3d5c0a 100644
--- a/ruoyi-production/src/main/java/com/ruoyi/plc/common/domain/PlcGvlCommon.java
+++ b/ruoyi-production/src/main/java/com/ruoyi/plc/common/domain/PlcGvlCommon.java
@@ -1,5 +1,7 @@
 package com.ruoyi.plc.common.domain;
 
+import java.time.Instant;
+import java.time.LocalTime;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -37,9 +39,8 @@ public class PlcGvlCommon extends BaseEntity
     private String dPatm;
 
     /** 计量日切换时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "计量日切换时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date gResetTime;
+    @Excel(name = "计量日切换时间", width = 30)
+    private Instant gResetTime;
 
     /** 参数变更标志 */
     @Excel(name = "参数变更标志")
@@ -126,12 +127,12 @@ public class PlcGvlCommon extends BaseEntity
         return dPatm;
     }
 
-    public void setgResetTime(Date gResetTime) 
+    public void setgResetTime(Instant gResetTime)
     {
         this.gResetTime = gResetTime;
     }
 
-    public Date getgResetTime() 
+    public Instant getgResetTime()
     {
         return gResetTime;
     }