From b15a4abad9dfe8a81ebf07385aa844ba7c2a8a40 Mon Sep 17 00:00:00 2001
From: wuzhen <52326163@qq.com>
Date: Wed, 16 Jul 2025 11:13:08 +0800
Subject: [PATCH] =?UTF-8?q?wuzhen=E6=8F=90=E4=BA=A4=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                        |  2 +-
 backend/ruoyi-admin/pom.xml            |  7 ++++++-
 backend/ruoyi-modules/pom.xml          |  1 +
 target/classes/META-INF/mps/autoMapper | 11 ++++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 34887f94..ba23e7a0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -382,7 +382,7 @@
                 <artifactId>ruoyi-xg</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <!--  学工管理-学生信息管理模块  -->
+            <!--  学工管理信息系统模块  -->
             <dependency>
                 <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-xg-xx</artifactId>
diff --git a/backend/ruoyi-admin/pom.xml b/backend/ruoyi-admin/pom.xml
index 1188b698..ddf8f8a1 100644
--- a/backend/ruoyi-admin/pom.xml
+++ b/backend/ruoyi-admin/pom.xml
@@ -112,7 +112,12 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-xg</artifactId>
         </dependency>
-
+        <!--  学工管理-学生信息管理模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-xg-xx</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!--  招生就业管理模块  -->
         <dependency>
             <groupId>org.dromara</groupId>
diff --git a/backend/ruoyi-modules/pom.xml b/backend/ruoyi-modules/pom.xml
index c3b2b3a7..290bf1e5 100644
--- a/backend/ruoyi-modules/pom.xml
+++ b/backend/ruoyi-modules/pom.xml
@@ -20,6 +20,7 @@
         <module>ruoyi-aqbw</module>
         <module>ruoyi-zsjy</module>
         <module>ruoyi-xg</module>
+        <module>ruoyi-xg-xx</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>
diff --git a/target/classes/META-INF/mps/autoMapper b/target/classes/META-INF/mps/autoMapper
index f932bb74..9c18732a 100644
--- a/target/classes/META-INF/mps/autoMapper
+++ b/target/classes/META-INF/mps/autoMapper
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 org.dromara.system.domain.vo.SysNoticeVo
 org.dromara.system.domain.bo.SysDictDataBo
 org.dromara.system.domain.bo.SysNoticeBo
@@ -65,4 +66,12 @@ org.dromara.hq.domain.bo.HqSatSurveyQuestionBo
 org.dromara.system.domain.vo.SysDictDataVo
 org.dromara.hq.domain.bo.HqVenueReservationBo
 org.dromara.system.domain.bo.SysRoleBo
-org.dromara.system.domain.vo.SysPostVo
\ No newline at end of file
+org.dromara.system.domain.vo.SysPostVo
+=======
+org.dromara.workflow.domain.vo.FlowCategoryVo
+org.dromara.workflow.domain.vo.TestLeaveVo
+org.dromara.workflow.domain.bo.TestLeaveBo
+org.dromara.xg.domain.bo.XgStudentInfoBo
+org.dromara.xg.domain.vo.XgStudentInfoVo
+org.dromara.workflow.domain.bo.FlowCategoryBo
+>>>>>>> Stashed changes