Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 5m46s

# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDevicePointVo.java
This commit is contained in:
lxj
2025-06-25 18:04:41 +08:00
244 changed files with 14886 additions and 145 deletions

View File

@@ -36,10 +36,16 @@
<jedis.version>3.8.0</jedis.version>
<jackson-mapper.version>1.9.13</jackson-mapper.version>
<kafka-clients.version>3.6.1</kafka-clients.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
<dependencyManagement>
<dependencies>
<!-- spring-framework-->
<dependency>
<groupId>org.springframework</groupId>