wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev_lcw

Browse Source 
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
#	ruoyi-ui/src/views/index.vue
This commit is contained in:
hsdllcw
2025-03-20 15:06:43 +08:00
parent fa024090ee a1ec1d57d4
commit f09cd2a2bf
46 changed files with 247 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/ruoyi-common-sensitive/pom.xml
View File

@@ -17,10 +17,10 @@
<dependencies>
<!-- RuoYi Common Security -->
<!-- RuoYi Common Core -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
</dependencies>