Merge branch 'refs/heads/zt-test' into test

# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/datapermission/QMSMultiDataPermissionHandler.java
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/mybatis/QMSDataPermissionConfig.java

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.46</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -143,7 +143,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -161,11 +161,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
+        <snapshotRepository>
-<!--        <id>ZT</id>-->
+            <id>ZT-snap</id>
-<!--        <name>中铜 ZStack 私服</name>-->
+            <name>中铜 ZStack 私服</name>
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
-<!--    </snapshotRepository>-->
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>

qms-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
 
   config:
     import:
-      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
+#      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
 
   # Servlet 配置