From 4f5d220cd175b1cb48c6fc91cb02cb12f6114746 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 18 八月 2025 11:10:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java
index d4403c7..1df2576 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java
@@ -10,12 +10,12 @@
// 省
private String province;
// 市
- private String page;
+ private String city;
// 状态
private Integer state;
// 活动状态
private Integer activityState;
// 活动时间
- private String time;
+ private String time;
}
--
Gitblit v1.7.1