Merge branch '1.0' of codeup.aliyun.com:5ec7ea24405cdab50f3fd8f0/galaxis/manatee into 1.0

src/main/java/com/galaxis/manatee/configuration/SpringAsyncConfiguration.java

@@ -0,0 +1,14 @@
+package com.galaxis.manatee.configuration;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/6/12 8:46 上午
+ */
+@Configuration
+@EnableAsync
+public class SpringAsyncConfiguration {
+}

src/main/java/com/galaxis/manatee/entity/chuanyun/data/object/ChuanyunGroupProjectDO.java

@@ -121,6 +121,19 @@ public class ChuanyunGroupProjectDO extends BasicDO {
     private String projectMember;
 
     /**
+     * 签约组织成本中心编码
+     */
+    @JsonProperty(value = "F0000032")
+    private String signCompany;
+
+    /**
+     * 客户编码
+     * U9编码
+     */
+    @JsonProperty(value = "F0000041")
+    private String customerCode;
+
+    /**
      * 项目组成员对象
      */
     @Transient
@@ -172,18 +185,9 @@ public class ChuanyunGroupProjectDO extends BasicDO {
 //    @JsonProperty(value = "F0000029")
 //    @JsonDeserialize(using = ChuanyunLocalDateTimeDeserializer.class)
 //    private LocalDateTime projectEndDateTime;
-//    /**
-//     * 客户编码
-//     * U9编码
-//     */
-//    @JsonProperty(value = "F0000054")
-//    private String customerCode;
+
 //
-//    /**
-//     * 签约组织成本中心编码
-//     */
-//    @JsonProperty(value = "F0000051")
-//    private String department;
+
 //
 //    /**
 //     * 项目经理