Merge branch 'dev' into test

# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/pom.xml

pom.xml

@@ -23,6 +23,8 @@
         <business.manage.version>3.0.43</business.manage.version>
         <business.qms.version>3.0.43</business.qms.version>
         <business.mes.version>3.0.43</business.mes.version>
+        <business.capital.version>3.0.43</business.capital.version>
+        <business.product.version>3.0.43</business.product.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -195,8 +197,13 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 

zt-module-bpm/zt-module-bpm-server/pom.xml

@@ -36,12 +36,12 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-module-capital-api</artifactId>
-            <version>${business.supply.version}</version>
+            <version>${business.capital.version}</version>
         </dependency>
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-module-product-api</artifactId>
-            <version>${business.mes.version}</version>
+            <version>${business.product.version}</version>
         </dependency>
 
         <!-- 业务组件 -->