Merge branch 'main' of https://gitea.bugtc.com/yuhaiming/bird_monitoring

# Conflicts: # ruoyi-admin/src/main/resources/application.yml
2026-09-18 09:45:45 +08:00
parent e0524d17eb 7bdc5c846d
commit e3b01e7b44
155 changed files with 15897 additions and 7 deletions
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -110,6 +110,12 @@
            <artifactId>ruoyi-demo</artifactId>
        </dependency>

+        <!-- 设备模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-device</artifactId>
+        </dependency>
+
        <!--  工作流模块  -->
        <dependency>
            <groupId>org.dromara</groupId>