合并代码

puzhibing

2024-03-01 fe0faf0cc923e6dcb0f7b244db0d7c34f4718b0e

 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;

}