Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

4 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 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;

}