From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java
index 9319c9b..28e6a5e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceQuery.java
@@ -10,7 +10,7 @@
     // 省
     private String province;
     // 市
-    private String page;
+    private String city;
     // 状态
     private Integer state;
     // 活动状态

--
Gitblit v1.7.1