合并代码

puzhibing

2024-03-02 48f8fffb3df2d8fd77c0a52df0e56e04eb5931ae

 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;

}