Merge remote-tracking branch 'origin/leng_dev' into fxz_dev

pigx-common/pigx-common-bom/pom.xml

@@ -25,6 +25,7 @@
         <mysql.connector.version>8.0.27</mysql.connector.version>
         <oracle.version>21.3.0.0</oracle.version>
         <sqlserver.version>8.4.1.jre8</sqlserver.version>
+        <dm.version>8.1.2.79</dm.version>
         <swagger.core.version>1.5.22</swagger.core.version>
         <mp.weixin.version>4.2.0</mp.weixin.version>
         <ijpay.version>2.8.0</ijpay.version>
@@ -189,6 +190,12 @@
                 <artifactId>mssql-jdbc</artifactId>
                 <version>${sqlserver.version}</version>
             </dependency>
+            <!--DM8-->
+            <dependency>
+                <groupId>com.dameng</groupId>
+                <artifactId>DmJdbcDriver18</artifactId>
+                <version>${dm.version}</version>
+            </dependency>
             <!--fastjson-->
             <dependency>
                 <groupId>com.alibaba</groupId>

pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfiguration.java

@@ -34,7 +34,7 @@ import javax.sql.DataSource;
  */
 @Configuration
 @AllArgsConstructor
-public class ActivitiConfig {
+public class ActivitiConfiguration {
 
 	private final DataSource dataSource;