From bcd683c6847a55763ae2ed67a3631afccc27cac7 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 23 Sep 2021 18:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=9B=9B=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=8D=A2=E6=A8=A1=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java       | 6 +++---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java      | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index 2ff8c15..dcbecdd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -139,21 +139,21 @@ public class WorkPlan extends BaseAPS {
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.Work, work);
     }
 
     public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); }
 
     public void setResource(Resource resource) {
-        this.resourceId = resource != null ? resource.getId() : 0l;
+        this.resourceId = resource != null ? resource.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.Resource, resource);
     }
 
     public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); }
 
     public void setWorkResource(WorkResource workResource) {
-        this.workResourceId = workResource != null ? workResource.getId() : 0l;
+        this.workResourceId = workResource != null ? workResource.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.WorkResource, workResource);
     }
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
index e204a88..fef2680 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
@@ -31,14 +31,13 @@ public abstract class BaseAPS extends BaseBean {
     @FieldAnnotation(property = false)
     private HashMap<String, Object> customFields = new HashMap<>();
 
-    @Column(name="KEY")
     @ApiParam(value ="主键值")
     @FieldAnnotation(display = false, modify = false)
     @Transient
     private String key;
 
     @FieldAnnotation(property = false)
-    private transient Long updateId = 0l;
+    private transient Long updateId = 0L;
 
     public Object getCustomField(String code) {
         return customFields.get(code);