合并代码

puzhibing

2024-03-04 9b7d12d6dbfd627e983d3b643b0a8bc7b528d8c1

 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;

}