Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-11 66107e6f0bb5c47192eb0178aba60dc9df061be8

 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;

}