Merge remote-tracking branch 'origin/master'

pom.xml

@@ -328,6 +328,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-subject</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-job</artifactId>

ruoyi-admin/pom.xml

@@ -93,6 +93,12 @@
             <artifactId>ruoyi-workflow</artifactId>
         </dependency>
 
+        <!--  项目模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-subject</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

ruoyi-modules/ruoyi-subject/src/main/java/org/dromara/subject/controller/subject/SubjectController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/subject/subject")
+@RequestMapping("/subject/subinfo")
 public class SubjectController extends BaseController {
 
     private final ISubjectService subjectService;

ruoyi-ui/apps/web-antd/src/api/subject/stock/reserve/index.ts

@@ -8,7 +8,7 @@ import { requestClient } from '#/api/request';
 enum Api {
   configExport = '/subject/config/export',
   configInfoByKey = '/subject/config/configKey',
-  pageList = '/subject/subject/list',
+  pageList = '/subject/subinfo/list',
   configRefreshCache = '/subject/config/refreshCache',
   root = '/system/config',
 }