Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

pmapi/pom.xml

@@ -223,11 +223,15 @@
         <!--KingBase-->
         <dependency>
             <groupId>com.kingbase8</groupId>
-            <artifactId>kingbase8-8.2.0</artifactId>
+            <artifactId>kingbase8-8.6.0</artifactId>
+            <version>8.2.0</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath>
         </dependency>
-
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-dict-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.kingbase.dialect</groupId>
             <artifactId>kingbase8-8.2.0</artifactId>

pmapi/src/main/java/com/ningdatech/pmapi/common/errorcode/AppErrorCode.java

@@ -1,5 +1,11 @@
 package com.ningdatech.pmapi.common.errorcode;
 
+import lombok.Getter;
+
+/**
+ * @author LiuXinXin
+ */
+@Getter
 public enum AppErrorCode {
     USER(100),
 

pmapi/src/main/resources/application-dev.yml

@@ -120,7 +120,7 @@ flowable:
   rest-api-enabled: false
   idm:
     enabled: false
-  cmmn:
+  common:
     enabled: false
   dmn:
     enabled: false

pom.xml

@@ -88,6 +88,11 @@
             </dependency>
             <dependency>
                 <groupId>com.ningdatech</groupId>
+                <artifactId>nd-dict-starter</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ningdatech</groupId>
                 <artifactId>nd-basic</artifactId>
                 <version>1.0.0</version>
             </dependency>