From 36a9d5bf9ac0c80bf051e159635ee749b0f10d07 Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期三, 26 三月 2025 11:24:44 +0800
Subject: [PATCH] Merge pull request #35 from Andy-Yin/develop1.0

---
 zhitan-system/src/main/java/com/zhitan/gatewaysetting/domain/GatewaySetting.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/gatewaysetting/domain/GatewaySetting.java b/zhitan-system/src/main/java/com/zhitan/gatewaysetting/domain/GatewaySetting.java
index a09a6f8..ec9787f 100644
--- a/zhitan-system/src/main/java/com/zhitan/gatewaysetting/domain/GatewaySetting.java
+++ b/zhitan-system/src/main/java/com/zhitan/gatewaysetting/domain/GatewaySetting.java
@@ -39,7 +39,7 @@
     private String installLocation;
 
     /** ip鍦板潃 */
-    @Excel(name = "ip鍦板潃")
+    @Excel(name = "IP鍦板潃")
     private String ipAdd;
 
     /** 杩愯鐘舵�侊細鏈煡銆佺绾裤�佸湪绾� */
@@ -48,7 +48,7 @@
 
     /** 蹇冭烦鏃堕棿 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "蹇冭烦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "蹇冭烦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private Date hbtTime;
 
     /** 璁¢噺鍣ㄥ叿鏁伴噺 */

--
Gitblit v1.9.3