合并代码

zhibing.pu

2024-07-24 c493d7d249a2b80555d64470a7f6112dd979d6fc

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

@@ -16,6 +16,6 @@
    // 活动状态
    private Integer activityState;
    // 活动时间
    private String  time;
    private String time;

}