Jenkins自动合并

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -62,7 +62,6 @@ public class BaseOrder extends BaseAPS {
 
     @Column(name="LET")
     @ApiParam(value ="最晚结束时刻")
-    @FieldAnnotation(notEmpty = true)
     private Date let;
 
     @Column(name="CALC_EST")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -863,8 +863,8 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CALENDAR_TYPE {
-        ENABLE("ENABLE", "启用"),
+        ENABLE("ENABLE", "加班"),
-        DISABLE("DISABLE", "停用");
+        DISABLE("DISABLE", "下班");
 
         private String value;
         private String description;