wuzhen提交本地修改

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>

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>

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>

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
+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