From 4013ed776b53bcbb154e64bfea23bc75689382fb Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 2 Jan 2020 22:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java        | 1 -
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
index 156db58..7c2d0ac 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/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")
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index fb63168..f7f6ab7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/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", "启用"),
-        DISABLE("DISABLE", "停用");
+        ENABLE("ENABLE", "加班"),
+        DISABLE("DISABLE", "下班");
 
         private String value;
         private String description;