疯狂的狮子li b3c3afc2b4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

2021-12-15 14:12:36 +08:00

..

src/main/java/com/ruoyi/common

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-12-15 14:12:36 +08:00

pom.xml

update hutool 工具 改为单包引入 减少无用依赖

2021-12-15 10:44:50 +08:00