Merge remote-tracking branch 'origin/master'

44323

2023-09-26 7aa9607492e2c0b70838c53083f5362e49e74f44

 cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceQuery.java

@@ -10,7 +10,7 @@
    // 省
    private String province;
    // 市
    private String page;
    private String city;
    // 状态
    private Integer state;
    // 活动状态