Merge remote-tracking branch 'origin/dev' into dev

pmapi/pom.xml

@@ -38,7 +38,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
@@ -209,6 +212,12 @@
         <dependency>
             <groupId>com.ningdatech</groupId>
             <artifactId>nd-flowable-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--浙政钉-->
         <dependency>

pom.xml

@@ -81,6 +81,11 @@
                 <version>1.0.0</version>
             </dependency>
             <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-extension</artifactId>
+                <version>${mybatis.plus.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.ningdatech</groupId>
                 <artifactId>nd-swagger2-starter</artifactId>
                 <version>1.0.0</version>