Merge branch 'dev' into test

2. 新增 iwork feign api 调用

pom.xml

@@ -18,9 +18,9 @@
         <module>zt-module-infra</module>
 <!--        <module>zt-module-bpm</module>-->
         <module>zt-module-report</module>
-<!--        <module>zt-module-mp</module>-->
+        <!--<module>zt-module-mp</module>-->
 <!--        <module>zt-module-ai</module>-->
-        <module>zt-module-template</module>
+<!--        <module>zt-module-template</module>-->
 <!--        <module>zt-module-iot</module>-->
         <module>zt-module-databus</module>
 <!--        <module>zt-module-rule</module>-->
@@ -32,7 +32,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.43</revision>
+        <revision>3.0.45</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -205,8 +205,13 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 
@@ -232,8 +237,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -245,8 +250,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -258,8 +263,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>local</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -269,6 +274,19 @@
                 <config.namespace>chenbowen</config.namespace>
             </properties>
         </profile>
+        <profile>
+            <id>qsj</id>
+            <properties>
+            <env.name>dev</env.name>
+            <!--Nacos 配置-->
+            <config.server-addr>172.16.46.63:30848</config.server-addr>
+            <config.namespace>qsj</config.namespace>
+            <config.group>DEFAULT_GROUP</config.group>
+            <config.username>nacos</config.username>
+            <config.password>P@ssword25</config.password>
+            <config.version>1.0.0</config.version>
+            </properties>
+        </profile>
     </profiles>
 
 </project>

sql/dm/字典导入菜单权限_DM8.sql

@@ -0,0 +1,15 @@
+-- DM8 字典导入按钮权限脚本
+-- 幂等处理：清理旧的导入权限按钮，再重新写入
+
+DELETE FROM system_role_menu WHERE menu_id = 103001;
+DELETE FROM system_menu WHERE id = 103001;
+
+INSERT INTO system_menu (
+    id, name, permission, type, sort, parent_id, path, icon, component, component_name,
+    status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted
+) VALUES (
+    103001, '字典导入', 'system:dict:import', 3, 6, 105, '#', '#', '', NULL,
+    0, '1', '1', '1', 'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'
+);
+
+-- 如需同步给指定角色，请手工向 system_role_menu 插入对应关系记录

sql/dm/工艺工序页面菜单权限_20251030.sql

@@ -0,0 +1,44 @@
+-- 工艺工序页面菜单与权限初始化脚本（DM8）
+-- 默认挂载在基础数据目录（parent_id = 6200），如需调整请修改 parent_id。
+
+DELETE FROM system_menu
+ WHERE id IN (6207, 620701, 620702, 620703, 620704, 620705);
+
+INSERT INTO system_menu (
+  id, name, permission, type, sort, parent_id,
+  path, icon, component, component_name,
+  status, visible, keep_alive, always_show,
+  creator, create_time, updater, update_time, deleted
+) VALUES (
+  6207, '工艺工序', 'base:processing-infomation-operation:query', 2, 70, 6200,
+  'processing-infomation-operation', 'ep:operation', 'base/processinginfomationoperation/index', 'ProcessingInfomationOperation',
+  0, '1', '0', '1',
+  'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'
+);
+
+INSERT INTO system_menu (
+  id, name, permission, type, sort, parent_id,
+  path, icon, component, component_name,
+  status, visible, keep_alive, always_show,
+  creator, create_time, updater, update_time, deleted
+) VALUES
+  (620701, '工艺工序查询', 'base:processing-infomation-operation:query', 3, 1, 6207,
+   '', '', '', '',
+   0, '1', '1', '1',
+   'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'),
+  (620702, '工艺工序创建', 'base:processing-infomation-operation:create', 3, 2, 6207,
+   '', '', '', '',
+   0, '1', '1', '1',
+   'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'),
+  (620703, '工艺工序更新', 'base:processing-infomation-operation:update', 3, 3, 6207,
+   '', '', '', '',
+   0, '1', '1', '1',
+   'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'),
+  (620704, '工艺工序删除', 'base:processing-infomation-operation:delete', 3, 4, 6207,
+   '', '', '', '',
+   0, '1', '1', '1',
+   'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0'),
+  (620705, '工艺工序导出', 'base:processing-infomation-operation:export', 3, 5, 6207,
+   '', '', '', '',
+   0, '1', '1', '1',
+   'admin', CURRENT_TIMESTAMP, 'admin', CURRENT_TIMESTAMP, '0');