合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/Day.java

@@ -30,7 +30,7 @@ public class Day {
     @ApiModelProperty(value = "节假日日期",example = "2020/2/1")
     private Date date;
 
-    @ApiModelProperty(value = "节假日描述",example = "为工作日还是休息日,默认0为工作日，1为休息日")
+    @ApiModelProperty(value = "节假日描述,为工作日还是休息日还是团建,默认0为工作日，1为休息日,2为团建",example = "0")
     private String status;
 
 }