合并代码

puzhibing

2024-03-04 31ee7996a480adb1b284bd75ea59903a9a2b8a86

 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;

}