Merge branch 'pre'

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceRuleCategoryPageVo.java

@@ -90,4 +90,7 @@ public class AttendanceRuleCategoryPageVo {
     @ApiModelProperty("状态（1：启用 0：禁用）")
     private Integer status;
 
+    @ApiModelProperty("非考勤周期是否允许进出（1：是 0：否）")
+    private Integer notCycleIsInOut;
+
 }