by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source 
# Conflicts:
#	ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
This commit is contained in:
dy
2025-06-25 17:05:04 +08:00
parent f615486c55 d81564f435
commit 2753a01842
185 changed files with 10761 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/resources/mapper/Property/TbAccessControlMapper.xml → ruoyi-modules/Property/src/main/resources/mapper/Property/AssetTypeMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.TbAccessControlMapper">
<mapper namespace="org.dromara.property.mapper.AssetTypeMapper">
</mapper>

7
ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.CleanserverOrderMapper">
</mapper>