From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显
---
ruoyi-admin/pom.xml | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index ae1928f..6c8e9a9 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -17,12 +17,12 @@
<dependencies>
- <!-- spring-boot-devtools -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
- </dependency>
+<!-- <!– spring-boot-devtools –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-devtools</artifactId>-->
+<!-- <optional>true</optional> <!– 琛ㄧず渚濊禆涓嶄細浼犻�� –>-->
+<!-- </dependency>-->
<!-- swagger3-->
<dependency>
@@ -43,6 +43,7 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
+ <!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
@@ -54,39 +55,55 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- </dependency>
-
<!--鍩虹妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>basic-server</artifactId>
- <version>${ruoyi.version}</version>
</dependency>
<!--涓氬姟妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>inspect-server</artifactId>
- <version>${ruoyi.version}</version>
</dependency>
<!--缁╂晥妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>performance-server</artifactId>
- <version>${ruoyi.version}</version>
</dependency>
+ <!--cnas鏍囧噯鐗╄川-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>cnas-require</artifactId>
- <version>${ruoyi.version}</version>
</dependency>
+ <!--cnas浣撶郴绠$悊瑕佹眰-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-manage</artifactId>
+ </dependency>
+
+ <!--cnas璁惧绠$悊-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-device</artifactId>
+ </dependency>
+
+ <!--cnas璧勬簮瑕佹眰-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-process</artifactId>
+ </dependency>
+
+ <!--cnas浜哄憳-->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-personnel</artifactId>
+ </dependency>
+
+
</dependencies>
<build>
--
Gitblit v1.9.3