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

src/main/java/com/xjrsoft/module/schedule/vo/TodayScheduleVo.java

@@ -34,9 +34,10 @@ public class TodayScheduleVo {
     @ApiModelProperty("名称")
     private String scheduleName;
 
-    @ApiModelProperty("类别")
-    private String category;
+    @ApiModelProperty("类别(0:课表 1:思政德育活动 2:党建活动 3:社团活动表 4:校企合作活动 5:赛事活动 6:会议)")
+    private Integer category;
 
     @ApiModelProperty("用户id")
     private String userId;
+
 }