songjinsheng
							
						 
					 | 
					
						
						
							
						
						8918116dbd
					 | 
					
						
						
							
							测试
						
						
						
						
						
						
							
						
					 | 
					
						2022-06-22 15:43:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qdxkrs
							
						 
					 | 
					
						
						
							
						
						1c16fc1d4a
					 | 
					
						
						
							
							添加基类
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-20 14:18:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						95542bf4c9
					 | 
					
						
						
							
							Merge branch 'master' into test
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-20 09:00:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						3598fafe66
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-20 08:59:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						de1dd3a808
					 | 
					
						
						
							
							功能迭代
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-20 08:56:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9c3b53b701
					 | 
					
						
						
							
							用户管理左侧树型组件增加选中高亮保持
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-13 15:02:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						f2cb431c90
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml
#	ruoyi-admin/src/main/resources/application.yml 
						
						
							
						
					 | 
					
						2022-05-11 17:27:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						9facc1b682
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-11 16:40:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								qdxkrs
							
						 
					 | 
					
						
						
							
						
						93835778ad
					 | 
					
						
						
							
							修改配置
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-11 16:40:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								songjinsheng
							
						 
					 | 
					
						
						
							
						
						8020eabaa9
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-11 15:58:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						5693bbe1f5
					 | 
					
						
						
							
							升级oshi到最新版本6.1.6
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-11 09:58:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						0055f479cb
					 | 
					
						
						
							
							修复字典数据显示不全问题(I55MR3)
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-09 20:27:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						1c41b701dd
					 | 
					
						
						
							
							优化excel创建表格样式
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-09 17:37:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9476f7f616
					 | 
					
						
						
							
							升级spring-boot到最新版本2.5.13
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-01 20:22:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						cbe405f6ea
					 | 
					
						
						
							
							ui code format
						
						
						
						
						
						
							
						
					 | 
					
						2022-05-01 20:22:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						7414bc492e
					 | 
					
						
						
							
							修改代码生成树选择组件
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-25 10:27:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						6f14087a16
					 | 
					
						
						
							
							修改显示顺序orderNum类型为整型
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-25 10:23:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						328d4b916d
					 | 
					
						
						
							
							Excel注解支持color字体颜色
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-23 20:53:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b42a8176ca
					 | 
					
						
						
							
							设置分页参数默认值
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-17 10:29:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						2a9beec31d
					 | 
					
						
						
							
							检查定时任务bean所在包名是否为白名单配置
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-16 22:06:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						910fe6261b
					 | 
					
						
						
							
							新增获取不带后缀文件名称方法
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-16 22:06:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						0c820b96d8
					 | 
					
						
						
							
							!471 新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们
						
						
						
						
						
						
						
						Merge pull request !471 from XCSDN/N/A 
						
						
							
						
					 | 
					
						2022-04-16 13:53:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								XCSDN
							
						 
					 | 
					
						
						
							
						
						c3c49a05c2
					 | 
					
						
						
							
							新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-16 06:02:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						68a616d7c7
					 | 
					
						
						
							
							升级element-ui到最新版本2.15.8
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-15 09:32:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a0447de061
					 | 
					
						
						
							
							字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-15 09:31:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						46db06a22b
					 | 
					
						
						
							
							!465 update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java.
						
						
						
						
						
						
						
						Merge pull request !465 from XCSDN/N/A 
						
						
							
						
					 | 
					
						2022-04-15 01:17:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						de5ae4a05e
					 | 
					
						
						
							
							添加页签openPage支持传递参数
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-08 15:42:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								XCSDN
							
						 
					 | 
					
						
						
							
						
						c0d430f4e5
					 | 
					
						
						
							
							update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java.
						
						
						
						
						
						
						
						字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成
防止由于字典类型不符合前端开发规范而报错 
						
						
							
						
					 | 
					
						2022-04-07 04:57:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d910888181
					 | 
					
						
						
							
							代码生成树表新增(展开/折叠)
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-07 10:56:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						db2dfee6ae
					 | 
					
						
						
							
							用户缓存信息添加部门ancestors祖级列表
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-07 09:50:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d311d56bbf
					 | 
					
						
						
							
							修复Excel注解prompt/combo同时使用不生效问题
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-03 18:28:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						3bc5ef38d3
					 | 
					
						
						
							
							升级spring-boot到最新版本2.5.12 防止RCE漏洞
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-02 10:16:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						bac3b3a0dc
					 | 
					
						
						
							
							降级jsencrypt版本兼容IE浏览器
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-02 10:15:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						07fded4da9
					 | 
					
						
						
							
							update readme
						
						
						
						
						
						
							
						
					 | 
					
						2022-04-02 10:13:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a854e0ca8e
					 | 
					
						
						
							
							若依 3.8.2
						
						
						
						
						
						
							
 v3.8.2
						
					 | 
					
						2022-04-01 08:30:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						de1766abde
					 | 
					
						
						
							
							新增清理分页的线程变量方法
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-31 11:48:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						01a566c794
					 | 
					
						
						
							
							升级spring-boot到最新版本2.5.11
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-30 10:40:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						5362a633e6
					 | 
					
						
						
							
							升级fastjson到最新版1.2.80
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-30 10:39:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b2c3f45141
					 | 
					
						
						
							
							update registry source
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-30 10:39:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d5f9b5b74a
					 | 
					
						
						
							
							topNav自定义隐藏侧边栏路由
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-30 10:38:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						2043d1f439
					 | 
					
						
						
							
							优化IP地址获取到多个的问题
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-27 14:36:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						61034d4dde
					 | 
					
						
						
							
							优化导出excel单元格验证,包含变更为开头.防止正常内容被替换
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-27 14:36:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						6605bf35a8
					 | 
					
						
						
							
							reset pr 452
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-26 17:28:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						b2b93e5060
					 | 
					
						
						
							
							!457 修改RedisCache方法形参命名
						
						
						
						
						
						
						
						Merge pull request !457 from lu_ming/master 
						
						
							
						
					 | 
					
						2022-03-26 09:25:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								“lumingsyc”
							
						 
					 | 
					
						
						
							
						
						098286fcaf
					 | 
					
						
						
							
							修改RedisCache方法形参命名
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-25 18:50:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						eaa12de740
					 | 
					
						
						
							
							添加新群号:167385320
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-22 16:47:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						857054179c
					 | 
					
						
						
							
							优化固定Header后顶部导航栏样式问题(I4XDN5)
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-17 09:42:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						0a3fcfd9f4
					 | 
					
						
						
							
							!453 update ruoyi-ui/src/store/modules/user.js.
						
						
						
						
						
						
						
						Merge pull request !453 from guxin0123/N/A 
						
						
							
						
					 | 
					
						2022-03-16 05:19:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								guxin0123
							
						 
					 | 
					
						
						
							
						
						0271aa5414
					 | 
					
						
						
							
							update ruoyi-ui/src/store/modules/user.js.
						
						
						
						
						
						
						
						修复数据库用户表 头像列为 null 时不显示默认头像问题 
						
						
							
						
					 | 
					
						2022-03-16 04:52:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a0364f0758
					 | 
					
						
						
							
							优化菜单名称过长悬停显示标题
						
						
						
						
						
						
							
						
					 | 
					
						2022-03-15 14:24:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |