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/java/com/ruoyi/system/controller/SysUserController.java
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
This commit is contained in:
hsdllcw
2025-05-23 14:31:52 +08:00
parent 0d37958304 3293e2fb56
commit d94840de17
24 changed files with 133 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -26,7 +26,7 @@
<pagehelper.boot.version>2.0.0</pagehelper.boot.version>
<druid.version>1.2.23</druid.version>
<dynamic-ds.version>4.3.1</dynamic-ds.version>
<commons.io.version>2.13.0</commons.io.version>
<commons.io.version>2.19.0</commons.io.version>
<velocity.version>2.3</velocity.version>
<fastjson.version>2.0.53</fastjson.version>
<jjwt.version>0.9.1</jjwt.version>
@@ -34,9 +34,8 @@
<poi.version>4.1.2</poi.version>
<springdoc.version>1.6.9</springdoc.version>
<transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
<!-- override dependency version -->
<tomcat.version>9.0.102</tomcat.version>
<tomcat.version>9.0.105</tomcat.version>
<logback.version>1.2.13</logback.version>
<spring-framework.version>5.3.39</spring-framework.version>
<kotlin.version>2.0.0</kotlin.version>