xingyu
							
						 
					 | 
					
						
						
							
						
						0ef05fba7c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java 
						
						
					 | 
					
						2023-01-17 21:18:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3d390d0d8f
					 | 
					
						
						
							
							feat: knife4j
						
						
						
						
						
						
					 | 
					
						2023-01-17 20:42:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						34f3e68558
					 | 
					
						
						
							
							fix: dict map
						
						
						
						
						
						
					 | 
					
						2023-01-17 15:13:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						dbfc485bb1
					 | 
					
						
						
							
							perf: dictTag
						
						
						
						
						
						
					 | 
					
						2023-01-17 15:07:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						d0ad54b4d7
					 | 
					
						
						
							
							feat: add dict color
						
						
						
						
						
						
					 | 
					
						2023-01-17 14:23:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e1341c187a
					 | 
					
						
						
							
							feat: deleteList rename deleteBatch
						
						
						
						
						
						
					 | 
					
						2023-01-17 14:05:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						19f34acc55
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-17 12:10:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f4a8dd4d7d
					 | 
					
						
						
							
							feat: 添加批量删除功能
						
						
						
						
						
						
					 | 
					
						2023-01-17 12:10:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						28ea779f83
					 | 
					
						
						
							
							feat: 调整分页样式,增加获取选中行方法
						
						
						
						
						
						
					 | 
					
						2023-01-17 11:17:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4d35bcef65
					 | 
					
						
						
							
							feat: springdoc success
						
						
						
						
						
						
					 | 
					
						2023-01-16 22:58:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						18c6445802
					 | 
					
						
						
							
							Merge branch 'dev' into feature/springdoc
						
						
						
						
						
						
					 | 
					
						2023-01-16 21:30:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1fd9056454
					 | 
					
						
						
							
							feat: add defult coler
						
						
						
						
						
						
					 | 
					
						2023-01-16 18:04:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6e49b19952
					 | 
					
						
						
							
							feat: 字典标签 自定义颜色
						
						
						
						
						
						
					 | 
					
						2023-01-16 17:54:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						cccf8d8197
					 | 
					
						
						
							
							fix: loginOut api
						
						
						
						
						
						
					 | 
					
						2023-01-16 17:00:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5450534a80
					 | 
					
						
						
							
							fix: uploadFile filelist
						
						
						
						
						
						
					 | 
					
						2023-01-16 16:53:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5311f57977
					 | 
					
						
						
							
							fix: xTable isList
						
						
						
						
						
						
					 | 
					
						2023-01-16 16:46:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						50e9d8274f
					 | 
					
						
						
							
							fix: types error
						
						
						
						
						
						
					 | 
					
						2023-01-16 15:20:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						cba69e94df
					 | 
					
						
						
							
							revert: file
						
						
						
						
						
						
					 | 
					
						2023-01-16 15:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						216fbeeffd
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-16 11:12:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						073b3048d1
					 | 
					
						
						
							
							perf: 优化代码生成器
						
						
						
						
						
						
					 | 
					
						2023-01-14 00:03:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a9c7d87872
					 | 
					
						
						
							
							perf: 调整代码生成器基础信息顺序
						
						
						
						
						
						
					 | 
					
						2023-01-14 00:00:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4941a43e08
					 | 
					
						
						
							
							perf: 重构代码生成 优化性能
						
						
						
						
						
						
					 | 
					
						2023-01-13 23:58:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						258577e86a
					 | 
					
						
						
							
							feat: scss
						
						
						
						
						
						
					 | 
					
						2023-01-13 23:31:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9236726006
					 | 
					
						
						
							
							fix: vueTypes  warn
						
						
						
						
						
						
					 | 
					
						2023-01-13 22:40:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						fb65423b62
					 | 
					
						
						
							
							fix: 部门更新后 树没有更新
						
						
						
						
						
						
					 | 
					
						2023-01-13 20:29:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3a8cd9afe9
					 | 
					
						
						
							
							refactor: router
						
						
						
						
						
						
					 | 
					
						2023-01-13 20:18:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						81595f81db
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-13 20:18:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						57aec5f11c
					 | 
					
						
						
							
							update: minio 8.5.1
						
						
						
						
						
						
					 | 
					
						2023-01-12 20:45:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						eef64f0293
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-12 13:55:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ed30f06ae1
					 | 
					
						
						
							
							feat: xtable增加预览功能
						
						
						
						
						
						
					 | 
					
						2023-01-06 17:20:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						71d4c5ad78
					 | 
					
						
						
							
							feat: remove console
						
						
						
						
						
						
					 | 
					
						2023-01-05 15:02:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						15ef2dbf78
					 | 
					
						
						
							
							fix: rememberMe bug
						
						
						
						
						
						
					 | 
					
						2023-01-05 15:02:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						efcbd1ab68
					 | 
					
						
						
							
							perf: 优化字典store
						
						
						
						
						
						
					 | 
					
						2023-01-05 14:52:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2dd1e01183
					 | 
					
						
						
							
							perf: 简化login代码
						
						
						
						
						
						
					 | 
					
						2023-01-05 14:21:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6a9244a707
					 | 
					
						
						
							
							feat: vue3 add websocket
						
						
						
						
						
						
					 | 
					
						2023-01-05 11:10:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						24f0e4dd1f
					 | 
					
						
						
							
							1.6.6 发版:完善 Vue3 管理后台、新增 IP & 地区库
						
						
						
						
						
						
					 | 
					
						2023-01-04 22:36:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0f722d0b42
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-04 22:09:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a0f2e0e138
					 | 
					
						
						
							
							fix: #I67WXP bug
						
						
						
						
						
						
					 | 
					
						2023-01-04 22:07:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5b64fc3d5d
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-04 22:01:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						474a606711
					 | 
					
						
						
							
							feat: 添加注释
						
						
						
						
						
						
					 | 
					
						2023-01-04 22:01:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ed7e3338f8
					 | 
					
						
						
							
							perf: 优化代码
						
						
						
						
						
						
					 | 
					
						2023-01-04 16:33:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e63e5ffe4c
					 | 
					
						
						
							
							fix: 树形 展开 关闭 功能 bug
						
						
						
						
						
						
					 | 
					
						2023-01-04 16:04:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c98965cd55
					 | 
					
						
						
							
							chore: update spring boot 2.7.7
						
						
						
						
						
						
						
						hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0 
						
						
					 | 
					
						2023-01-04 10:12:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						377bc5048e
					 | 
					
						
						
							
							docs: 更新文档版本
						
						
						
						
						
						
					 | 
					
						2023-01-03 17:50:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c6445516d8
					 | 
					
						
						
							
							docs: 更新文档版本
						
						
						
						
						
						
					 | 
					
						2023-01-03 17:46:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						8488933ec4
					 | 
					
						
						
							
							refactor: Xtable
						
						
						
						
						
						
					 | 
					
						2023-01-03 16:35:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f2d2dc4d9e
					 | 
					
						
						
							
							perf: XTable hooks
						
						
						
						
						
						
					 | 
					
						2023-01-03 14:23:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f352c4d941
					 | 
					
						
						
							
							reactor: 重构 XTable
						
						
						
						
						
						
					 | 
					
						2023-01-03 11:21:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a984eac965
					 | 
					
						
						
							
							feat: 完善xtable组件
						
						
						
						
						
						
					 | 
					
						2023-01-03 10:40:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a74c6b0805
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-03 10:11:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |