From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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