疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e3ea16d020
					 | 
					
						
						
							
							update 修改MP验证策略 NOT_NULL -> NOT_EMPTY
						
						
						
						
						
						
					 | 
					
						2021-04-25 10:38:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5fcef39a2e
					 | 
					
						
						
							
							add 集成 spring-boot-admin 全方位监控
						
						
						
						
						
						
					 | 
					
						2021-04-22 15:04:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f8633f8c4e
					 | 
					
						
						
							
							fix Feign 熔断不生效 bug
						
						
						
						
						
						
					 | 
					
						2021-04-19 17:38:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f093da99ec
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/druid/index.vue 
						
						
					 | 
					
						2021-04-14 13:22:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						c8df1f5e1f
					 | 
					
						
						
							
							布局设置支持保存&重置配置
						
						
						
						
						
						
					 | 
					
						2021-04-13 09:47:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5d1e977442
					 | 
					
						
						
							
							个人信息添加手机&邮箱重复验证
						
						
						
						
						
						
					 | 
					
						2021-03-22 09:30:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8434511e39
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java 
						
						
					 | 
					
						2021-03-22 09:29:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						67371a9028
					 | 
					
						
						
							
							个人信息添加手机&邮箱重复验证
						
						
						
						
						
						
					 | 
					
						2021-03-21 08:53:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wugh
							
						 
					 | 
					
						
						
							
						
						1270b056d5
					 | 
					
						
						
							
							[bug修复] 解决调整验证码干扰的类型无效,只用circle的bug
						
						
						
						
						
						
						
						[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码 
						
						
					 | 
					
						2021-03-19 19:28:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						31ddb2aee3
					 | 
					
						
						
							
							update swagger 升级为 knife4j
						
						
						
						
						
						
					 | 
					
						2021-03-16 12:52:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						63a582404b
					 | 
					
						
						
							
							update swagger 模板修改为 swagger-bootstrap-ui
						
						
						
						
						
						
					 | 
					
						2021-03-15 17:51:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9b4b9e0c74
					 | 
					
						
						
							
							update 删除通用工具 改为使用hutool
						
						
						
						
						
						
					 | 
					
						2021-03-15 16:38:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						46aa17db9c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2021-03-15 10:00:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						71325b540a
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java 
						
						
					 | 
					
						2021-03-15 10:00:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						c2e9200626
					 | 
					
						
						
							
							数据监控默认账户密码防止越权访问
						
						
						
						
						
						
					 | 
					
						2021-03-14 16:37:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2509815a4f
					 | 
					
						
						
							
							fix 验证码点击不刷新 bug
						
						
						
						
						
						
					 | 
					
						2021-03-14 00:15:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						57cfad671f
					 | 
					
						
						
							
							update 使用hutool重写验证码生成
						
						
						
						
						
						
					 | 
					
						2021-03-12 16:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hechieh
							
						 
					 | 
					
						
						
							
						
						51d942f14c
					 | 
					
						
						
							
							update ruoyi-admin/src/main/resources/application.yml.
						
						
						
						
						
						
					 | 
					
						2021-03-10 13:27:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ac99fddfe6
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue 
						
						
					 | 
					
						2021-02-22 10:04:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						0b5c7f4c96
					 | 
					
						
						
							
							若依 3.4.0
						
						
						
						
						
						
					 | 
					
						2021-02-22 09:40:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						118c02144f
					 | 
					
						
						
							
							集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
						
						
						
						
						
						
					 | 
					
						2021-01-27 15:15:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3362ce5f33
					 | 
					
						
						
							
							升级 MybatisPlus 3.4.2
						
						
						
						
						
						
					 | 
					
						2021-01-15 15:55:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d73994f05d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue 
						
						
					 | 
					
						2021-01-05 09:22:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						2116ee1822
					 | 
					
						
						
							
							Update copyright
						
						
						
						
						
						
					 | 
					
						2021-01-04 17:49:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b8f6731584
					 | 
					
						
						
							
							增加 demo模块 方便参考扩展
						
						
						
						
						
						
					 | 
					
						2020-12-29 10:17:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1000a577d0
					 | 
					
						
						
							
							配置文件新增redis数据库索引属性
						
						
						
						
						
						
					 | 
					
						2020-12-21 11:58:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						fd7e88a518
					 | 
					
						
						
							
							配置文件新增redis数据库索引属性
						
						
						
						
						
						
					 | 
					
						2020-12-21 10:26:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								li_oxen
							
						 
					 | 
					
						
						
							
						
						1caec85f46
					 | 
					
						
						
							
							redis 增加 database配置项,设置不同的库
						
						
						
						
						
						
					 | 
					
						2020-12-19 10:08:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7e476b941e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue 
						
						
					 | 
					
						2020-12-14 09:27:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						8988d0b4ab
					 | 
					
						
						
							
							若依 3.3.0
						
						
						
						
						
						
					 | 
					
						2020-12-14 09:02:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f56f57a236
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js 
						
						
					 | 
					
						2020-12-11 14:27:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9e387dc447
					 | 
					
						
						
							
							去除用户手机邮箱部门必填验证
						
						
						
						
						
						
					 | 
					
						2020-12-11 13:26:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5109eb0e7e
					 | 
					
						
						
							
							日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
						
						
						
						
						
						
					 | 
					
						2020-12-09 13:37:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						583738fa65
					 | 
					
						
						
							
							日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
						
						
						
						
						
						
					 | 
					
						2020-12-09 13:33:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5a62019cdd
					 | 
					
						
						
							
							更新 如何修改为Tomcat相关注释配置与说明
						
						
						
						
						
						
					 | 
					
						2020-12-08 16:21:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						474cca921e
					 | 
					
						
						
							
							回显数据字典防止空值报错
						
						
						
						
						
						
					 | 
					
						2020-12-08 16:12:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abbfun
							
						 
					 | 
					
						
						
							
						
						c01eeb8521
					 | 
					
						
						
							
							update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java.
						
						
						
						
						
						
					 | 
					
						2020-12-08 11:11:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f7f7557d4d
					 | 
					
						
						
							
							项目修改为 maven多环境配置
						
						
						
						
						
						
					 | 
					
						2020-12-01 11:44:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						20d7c90515
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	sql/ry_20201123.sql 
						
						
					 | 
					
						2020-11-24 10:03:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						90ac416e02
					 | 
					
						
						
							
							新增缓存监控功能
						
						
						
						
						
						
					 | 
					
						2020-11-23 10:02:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ff563c44e2
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue 
						
						
					 | 
					
						2020-11-18 10:41:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						8f145bba3a
					 | 
					
						
						
							
							若依 v3.2.1
						
						
						
						
						
						
					 | 
					
						2020-11-18 09:32:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						6bb166b89f
					 | 
					
						
						
							
							阻止任意文件下载漏洞
						
						
						
						
						
						
					 | 
					
						2020-11-17 10:29:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						527decb7fa
					 | 
					
						
						
							
							更新 undertow 配置
						
						
						
						
						
						
					 | 
					
						2020-11-16 14:50:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						03f0e3a137
					 | 
					
						
						
							
							为所有MP插件和配置增加官方链接
						
						
						
						
						
						
					 | 
					
						2020-11-16 14:12:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						04d1154be0
					 | 
					
						
						
							
							重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释
						
						
						
						
						
						
					 | 
					
						2020-11-13 11:18:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8747d36b2c
					 | 
					
						
						
							
							更改日志存储路径 使用项目变量
						
						
						
						
						
						
					 | 
					
						2020-10-20 16:38:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1a15c528a2
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java 
						
						
					 | 
					
						2020-10-16 10:27:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								abbfun
							
						 
					 | 
					
						
						
							
						
						c6d0b9a9ae
					 | 
					
						
						
							
							update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java.
						
						
						
						
						
						
						
						权限字符串修正 
						
						
					 | 
					
						2020-10-14 16:21:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						69256940df
					 | 
					
						
						
							
							若依 3.2
						
						
						
						
						
						
					 | 
					
						2020-10-10 09:38:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |