wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-28 04:31:57 +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

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
View File

@@ -136,6 +136,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
return new Date(time);
}
/**
* 计算相差天数
*/
public static int differentDaysByMillisecond(Date date1, Date date2)
{
return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
}
/**
* 计算时间差
*