YunaiV
							
						 
					 | 
					
						
						
							
						
						9a5c8a11f5
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
#	yudao-module-system/yudao-module-system-biz/pom.xml 
						
						
					 | 
					
						2022-12-23 19:38:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						79f77e61ba
					 | 
					
						
						
							
							!339 修复 vue3 部分问题
						
						
						
						
						
						
						
						Merge pull request !339 from xingyu/dev 
						
						
					 | 
					
						2022-12-23 11:26:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						92632c046c
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue 
						
						
					 | 
					
						2022-12-23 19:12:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7a4a6a3046
					 | 
					
						
						
							
							product:优化管理后台相关的接口
						
						
						
						
						
						
						
						area:增加地区列表界面 
						
						
					 | 
					
						2022-12-23 18:47:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						491921d5ae
					 | 
					
						
						
							
							code review 站内信代码
						
						
						
						
						
						
					 | 
					
						2022-12-23 18:41:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6481663c42
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-23 18:05:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						faa6f05d9b
					 | 
					
						
						
							
							fix: vxe 暗黑模式刷新丢失
						
						
						
						
						
						
					 | 
					
						2022-12-23 18:05:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						fc2b62714c
					 | 
					
						
						
							
							fix: menu error
						
						
						
						
						
						
					 | 
					
						2022-12-23 18:01:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						31760d9572
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-12-23 17:55:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c8f4ba66d1
					 | 
					
						
						
							
							fix: 部门更新 log 错误
						
						
						
						
						
						
					 | 
					
						2022-12-23 16:23:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						0e6b4e463f
					 | 
					
						
						
							
							fix: 解决 redis mq 消息丢失问题
						
						
						
						
						
						
					 | 
					
						2022-12-23 10:33:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						2d7d3f1511
					 | 
					
						
						
							
							fix: 解决 redis mq 消息丢失问题
						
						
						
						
						
						
					 | 
					
						2022-12-23 10:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						e9645d7054
					 | 
					
						
						
							
							fix: 解决 redis mq 消息丢失问题
						
						
						
						
						
						
					 | 
					
						2022-12-23 10:31:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						46f3790492
					 | 
					
						
						
							
							fix: 解决 redis mq 消息丢失问题
						
						
						
						
						
						
					 | 
					
						2022-12-23 10:28:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						893b6cf4f2
					 | 
					
						
						
							
							!338 vue3 重构头像上传
						
						
						
						
						
						
						
						Merge pull request !338 from xingyu/dev 
						
						
					 | 
					
						2022-12-23 00:22:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1bb1da5838
					 | 
					
						
						
							
							fix: 代码生成日期类型 LocalDateTime
						
						
						
						
						
						
					 | 
					
						2022-12-22 15:05:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						bdd8229c97
					 | 
					
						
						
							
							perf: message
						
						
						
						
						
						
					 | 
					
						2022-12-22 14:21:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						664c6258de
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-22 14:15:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c7b6030418
					 | 
					
						
						
							
							feat: 添加消息图标面板
						
						
						
						
						
						
					 | 
					
						2022-12-22 14:15:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2d5571bcce
					 | 
					
						
						
							
							fix: 版本
						
						
						
						
						
						
					 | 
					
						2022-12-22 10:03:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						dcb4a1e5e6
					 | 
					
						
						
							
							fix: menu component name
						
						
						
						
						
						
					 | 
					
						2022-12-22 09:06:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						34c7ecc1a6
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-21 16:20:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7eb0fb1655
					 | 
					
						
						
							
							fix: close modal
						
						
						
						
						
						
					 | 
					
						2022-12-21 16:18:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						91abae8898
					 | 
					
						
						
							
							refactor: cropper
						
						
						
						
						
						
					 | 
					
						2022-12-21 16:10:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0f562e59c2
					 | 
					
						
						
							
							fix: menu 高度不一致的问题
						
						
						
						
						
						
					 | 
					
						2022-12-21 13:06:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4bbfffb9fb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-12-21 10:20:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b5e0b168c7
					 | 
					
						
						
							
							!337 完善vue3上传组件 && 提升打包速度
						
						
						
						
						
						
						
						Merge pull request !337 from xingyu/dev 
						
						
					 | 
					
						2022-12-20 12:22:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						ea67a47939
					 | 
					
						
						
							
							!336 update codegen/vue3/views/data.ts.vm
						
						
						
						
						
						
						
						Merge pull request !336 from supine-win/N/A 
						
						
					 | 
					
						2022-12-20 12:21:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						50c4fb7bfd
					 | 
					
						
						
							
							docs: 优化文档排版
						
						
						
						
						
						
					 | 
					
						2022-12-20 16:36:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1ef6016d9d
					 | 
					
						
						
							
							perf: 路由子集显示可配置
						
						
						
						
						
						
					 | 
					
						2022-12-20 16:05:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ec0bb01e07
					 | 
					
						
						
							
							perf: 缓存首页
						
						
						
						
						
						
					 | 
					
						2022-12-20 15:52:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b88f042d20
					 | 
					
						
						
							
							feat: 当只有一个子菜单时显示父级
						
						
						
						
						
						
					 | 
					
						2022-12-20 15:49:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e78e1a9cf1
					 | 
					
						
						
							
							docs: 升级对应版本
						
						
						
						
						
						
					 | 
					
						2022-12-20 15:22:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5cf65cf401
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-20 15:21:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9de323e09c
					 | 
					
						
						
							
							perf: 完善上传组件
						
						
						
						
						
						
					 | 
					
						2022-12-20 15:15:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2d79130106
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-20 14:21:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								supine-win
							
						 
					 | 
					
						
						
							
						
						736a3505a6
					 | 
					
						
						
							
							update codegen/vue3/views/data.ts.vm
						
						
						
						
						
						
						
						字典值类型生成修正
Signed-off-by: supine-win <supine.win@gmail.com> 
						
						
					 | 
					
						2022-12-20 04:44:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						85e9a17569
					 | 
					
						
						
							
							fix: 字典类型代码生成
						
						
						
						
						
						
					 | 
					
						2022-12-20 12:44:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						17d9a4e4f2
					 | 
					
						
						
							
							perf: 优化数据库建表语句
						
						
						
						
						
						
					 | 
					
						2022-12-20 09:10:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6c521fd5e0
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-19 22:21:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						867cd8c6ec
					 | 
					
						
						
							
							fix: i18n types
						
						
						
						
						
						
					 | 
					
						2022-12-19 17:41:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5434be460c
					 | 
					
						
						
							
							chore: use unplugin i18n
						
						
						
						
						
						
					 | 
					
						2022-12-19 15:28:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						46c93b637f
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-19 10:51:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						47beb13a58
					 | 
					
						
						
							
							fix: 打包后页面跳转问题
						
						
						
						
						
						
					 | 
					
						2022-12-19 10:13:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						de70cc0cba
					 | 
					
						
						
							
							!335 修复 vue3 eslint 报错
						
						
						
						
						
						
						
						Merge pull request !335 from xingyu/dev 
						
						
					 | 
					
						2022-12-19 01:54:18 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6db1f77d13
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-12-19 09:31:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						75768d8822
					 | 
					
						
						
							
							fix: eslint
						
						
						
						
						
						
					 | 
					
						2022-12-19 09:26:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						5cac636f32
					 | 
					
						
						
							
							feature(站内信开发): 添加脚本
						
						
						
						
						
						
					 | 
					
						2022-12-17 17:30:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						ed2d195411
					 | 
					
						
						
							
							站内信开发
						
						
						
						
						
						
					 | 
					
						2022-12-17 16:42:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						826a564abd
					 | 
					
						
						
							
							站内信开发
						
						
						
						
						
						
					 | 
					
						2022-12-17 16:41:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |