Merge branch 'main' into dyf-device

# Conflicts:
#	fys-modules/pom.xml
#	pom.xml

fys-admin/pom.xml

@@ -72,7 +72,7 @@
         </dependency>
 
         <!-- 设备管理模块 -->
-        <dependency>
+       <dependency>
             <groupId>com.fuyuanshen</groupId>
             <artifactId>fys-equipment</artifactId>
         </dependency>
@@ -105,6 +105,13 @@
             <artifactId>fys-workflow</artifactId>
         </dependency>
 
+        <!--  app模块  -->
+        <dependency>
+            <groupId>com.fuyuanshen</groupId>
+            <artifactId>fys-app</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>