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

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

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

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

2020-08-31 09:12:13 +08:00

..

java

修改代码生成 删除主键type注解配置 使用全局配置

2020-08-19 17:03:21 +08:00

js

同步升级3.0

2020-07-20 10:41:32 +08:00

sql

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

2020-07-23 09:54:57 +08:00

vue

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

2020-08-31 09:12:13 +08:00

xml

同步升级3.0

2020-07-20 10:41:32 +08:00