From 10e83311f7457f07b3d0928fba0de6a5622f1748 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 06 三月 2025 09:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
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