合并代码

puzhibing

2023-12-14 f21cf2729f0ebf3cfea564c8bc0fc7349cdabe48

 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;

}