疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						97a12075b1
					 | 
					
						
						
							
							update 初始化数据转移到 ApplicationRunner 统一处理
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:58:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4cfbd8a9d2
					 | 
					
						
						
							
							update OSS 模块 整体重命名 消除歧义
						
						
						
						
						
						
					 | 
					
						2021-11-22 09:45:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						6d3f4f5a04
					 | 
					
						
						
							
							update 抽象 DictService 通用 字典服务
						
						
						
						
						
						
					 | 
					
						2021-11-22 02:43:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						20e782eb21
					 | 
					
						
						
							
							update 抽象 ConfigService 通用 参数配置服务
						
						
						
						
						
						
					 | 
					
						2021-11-22 02:42:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						019526fbe9
					 | 
					
						
						
							
							update 解耦 LoginUser 与 SysUser 强关联
						
						
						
						
						
						
					 | 
					
						2021-11-21 01:39:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						a4cd5bd424
					 | 
					
						
						
							
							update 统一接口命名
						
						
						
						
						
						
					 | 
					
						2021-11-21 01:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						eb844e3260
					 | 
					
						
						
							
							fix 修复 OssFactory 在程序启动未调用api 没有初始化 导致无法订阅配置更改问题
						
						
						
						
						
						
					 | 
					
						2021-11-17 13:50:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								phanes
							
						 
					 | 
					
						
						
							
						
						984098abce
					 | 
					
						
						
							
							fix: 修复返回参数的数据类型错误的问题
						
						
						
						
						
						
					 | 
					
						2021-11-16 20:47:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						149b136e0b
					 | 
					
						
						
							
							fix 修复用户导入字典使用错误
						
						
						
						
						
						
					 | 
					
						2021-11-14 22:27:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								phanes
							
						 
					 | 
					
						
						
							
						
						8ea56d3b22
					 | 
					
						
						
							
							update 减少使用特定数据库函数
						
						
						
						
						
						
					 | 
					
						2021-11-07 11:58:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						19b7f0747a
					 | 
					
						
						
							
							update 补全通用用户服务接口注释
						
						
						
						
						
						
					 | 
					
						2021-11-04 19:00:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c7c9bd6b08
					 | 
					
						
						
							
							fix 修复 用户逻辑删除 差异问题
						
						
						
						
						
						
					 | 
					
						2021-11-04 18:49:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2f21f293c1
					 | 
					
						
						
							
							update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回
						
						
						
						
						
						
					 | 
					
						2021-11-04 10:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						f3c9a4a81c
					 | 
					
						
						
							
							fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题
						
						
						
						
						
						
					 | 
					
						2021-10-31 21:30:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						cd0aad10b0
					 | 
					
						
						
							
							fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题
						
						
						
						
						
						
					 | 
					
						2021-10-31 21:28:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						24ebc73ee5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into satoken
						
						
						
						
						
						
					 | 
					
						2021-10-29 09:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d6e080d546
					 | 
					
						
						
							
							发布 v3.3.0
						
						
						
						
						
						
					 | 
					
						2021-10-29 09:14:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f5f16aac96
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into satoken
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-common/pom.xml 
						
						
					 | 
					
						2021-10-28 10:56:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3f0d3ffb8a
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java 
						
						
					 | 
					
						2021-10-28 09:40:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Awen
							
						 
					 | 
					
						
						
							
						
						13c770b6be
					 | 
					
						
						
							
							优化一些布尔判断语法
						
						
						
						
						
						
					 | 
					
						2021-10-27 19:03:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						695cb6d76b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into satoken
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java 
						
						
					 | 
					
						2021-10-27 13:16:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Remenber_Ray
							
						 
					 | 
					
						
						
							
						
						0628dc9b2f
					 | 
					
						
						
							
							update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java.
						
						
						
						
						
						
					 | 
					
						2021-10-26 08:02:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						d254340b9b
					 | 
					
						
						
							
							fix 修正错别字
						
						
						
						
						
						
					 | 
					
						2021-10-25 18:33:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						42a3117e2a
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ry.bat 
						
						
					 | 
					
						2021-10-25 18:24:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1ae369855b
					 | 
					
						
						
							
							update 优化 多账号体系用户行为监听逻辑
						
						
						
						
						
						
					 | 
					
						2021-10-19 17:23:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						e66d0e4f74
					 | 
					
						
						
							
							角色列表返回类型保持一致
						
						
						
						
						
						
					 | 
					
						2021-10-15 17:56:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a6fb88d74c
					 | 
					
						
						
							
							update [重大更新]全业务 增加 接口文档注解 格式化代码
						
						
						
						
						
						
					 | 
					
						2021-10-15 15:19:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liyang
							
						 
					 | 
					
						
						
							
						
						1eaea5c81c
					 | 
					
						
						
							
							修改oss配置删除时删除缓存bug
						
						
						
						
						
						
					 | 
					
						2021-10-14 21:26:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						aaf9f57459
					 | 
					
						
						
							
							update 去除登录警告
						
						
						
						
						
						
					 | 
					
						2021-10-11 16:49:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						741a5b275b
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
	ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/monitor/server/index.vue 
						
						
					 | 
					
						2021-10-11 09:37:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						bc6db547d6
					 | 
					
						
						
							
							fix 修复密码校验错误
						
						
						
						
						
						
					 | 
					
						2021-10-04 16:41:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						a006904724
					 | 
					
						
						
							
							fix
						
						
						
						
						
						
					 | 
					
						2021-09-30 03:18:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f05138df62
					 | 
					
						
						
							
							update 适配单体系与多体系用户权限
						
						
						
						
						
						
					 | 
					
						2021-09-28 17:55:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						76a2e7f8e5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into satoken
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java 
						
						
					 | 
					
						2021-09-28 09:46:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3f142dd0fa
					 | 
					
						
						
							
							发布 v3.2.0
						
						
						
						
						
						
					 | 
					
						2021-09-28 09:41:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a6a9814c06
					 | 
					
						
						
							
							update 更新 service 注解
						
						
						
						
						
						
					 | 
					
						2021-09-27 17:58:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c2e43cc781
					 | 
					
						
						
							
							update 修复合并异常
						
						
						
						
						
						
					 | 
					
						2021-09-26 17:16:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6f6a3566ac
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into satoken
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java 
						
						
					 | 
					
						2021-09-26 17:15:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8a81f37d22
					 | 
					
						
						
							
							update 同步ruoyi
						
						
						
						
						
						
					 | 
					
						2021-09-26 10:08:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						125547f08f
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
	ruoyi-ui/src/views/monitor/server/index.vue 
						
						
					 | 
					
						2021-09-26 10:05:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						553c29ab8a
					 | 
					
						
						
							
							update 整合 satoken 权限、鉴权一体化框架
						
						
						
						
						
						
					 | 
					
						2021-09-23 19:13:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2ccbaf9143
					 | 
					
						
						
							
							update 补全 @Override 注解
						
						
						
						
						
						
					 | 
					
						2021-09-18 18:05:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						50599487f8
					 | 
					
						
						
							
							update [重大改动] 将 framework 与 system 模块 解耦
						
						
						
						
						
						
					 | 
					
						2021-09-17 14:48:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2af534eea4
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210908.sql 
						
						
					 | 
					
						2021-09-13 13:03:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						db193a46e8
					 | 
					
						
						
							
							若依 3.7.0
						
						
						
						
						
						
					 | 
					
						2021-09-13 09:36:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c1c6c1cf30
					 | 
					
						
						
							
							update 将所有 云存储字样 改为 对象存储 避免误解
						
						
						
						
						
						
					 | 
					
						2021-09-10 10:51:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a5e38f6f99
					 | 
					
						
						
							
							菜单管理支持配置路由参数
						
						
						
						
						
						
					 | 
					
						2021-09-08 09:28:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						3b5fb07c3d
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev
						
						
						
						
						
						
					 | 
					
						2021-09-07 05:49:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ddf8d6ad6b
					 | 
					
						
						
							
							发布 v3.1.0
						
						
						
						
						
						
					 | 
					
						2021-09-07 13:48:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						182edef28a
					 | 
					
						
						
							
							update 所有业务适配 RedisUtils 新工具
						
						
						
						
						
						
					 | 
					
						2021-09-07 13:20:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |