Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot

# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
2025-06-15 19:13:07 +08:00
parent 1328d91987 03d3ebdf05
commit 4e3cfd83bd
202 changed files with 10089 additions and 2391 deletions
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -138,7 +138,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>