YunaiV
							
						 
					 | 
					
						
						
							
						
						feb09900ea
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-11-29 22:33:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						53dbf8d82e
					 | 
					
						
						
							
							!290 修复三级及以上菜单路由缓存失效问题
						
						
						
						
						
						
					 | 
					
						2022-11-29 22:33:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4e860eb254
					 | 
					
						
						
							
							perf: 完善类型
						
						
						
						
						
						
					 | 
					
						2022-11-29 22:26:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						8c4ba396be
					 | 
					
						
						
							
							!309 fix:流程代办,日期时区转换错误
						
						
						
						
						
						
						
						Merge pull request !309 from zy_2021/master 
						
						
					 | 
					
						2022-11-29 14:17:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						44249e43dd
					 | 
					
						
						
							
							!313 修复上传七牛云无mime type问题
						
						
						
						
						
						
						
						Merge pull request !313 from 石溪/master 
						
						
					 | 
					
						2022-11-29 13:12:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7e41b763f6
					 | 
					
						
						
							
							feat: grid add delete api
						
						
						
						
						
						
					 | 
					
						2022-11-29 21:02:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6b2d1b50ee
					 | 
					
						
						
							
							fix: dict select
						
						
						
						
						
						
					 | 
					
						2022-11-29 20:43:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						d47c2020d3
					 | 
					
						
						
							
							refator: button
						
						
						
						
						
						
					 | 
					
						2022-11-29 20:41:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1570e38792
					 | 
					
						
						
							
							fix: delete reload
						
						
						
						
						
						
					 | 
					
						2022-11-29 19:53:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						cf4d1be55d
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-29 19:45:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						93dd8b7b56
					 | 
					
						
						
							
							feat: uploadImg 组件
						
						
						
						
						
						
					 | 
					
						2022-11-29 18:00:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						ba547e9e2d
					 | 
					
						
						
							
							chore: 升级积木报表 1.5.4
						
						
						
						
						
						
					 | 
					
						2022-11-29 14:52:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						8cadd6abc8
					 | 
					
						
						
							
							style: 更多按钮
						
						
						
						
						
						
					 | 
					
						2022-11-29 14:47:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						58ef8a6b1d
					 | 
					
						
						
							
							style: crontab
						
						
						
						
						
						
					 | 
					
						2022-11-29 14:24:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						583921112b
					 | 
					
						
						
							
							fix: todo
						
						
						
						
						
						
					 | 
					
						2022-11-28 23:13:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						227e11f9c7
					 | 
					
						
						
							
							fix: todo
						
						
						
						
						
						
					 | 
					
						2022-11-28 22:38:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						26fd35e31d
					 | 
					
						
						
							
							fix: contentDetailWrap 暗黑模式
						
						
						
						
						
						
					 | 
					
						2022-11-28 22:20:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						391fec3758
					 | 
					
						
						
							
							!300 refactor: vue3 vxe table
						
						
						
						
						
						
						
						Merge pull request !300 from xingyu/feature/vue3 
						
						
					 | 
					
						2022-11-28 11:41:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						005a3e6ab0
					 | 
					
						
						
							
							fix: bugs
						
						
						
						
						
						
					 | 
					
						2022-11-28 16:50:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						dec05a6c40
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/vue3
						
						
						
						
						
						
					 | 
					
						2022-11-28 14:38:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						66abe4a84b
					 | 
					
						
						
							
							trade:完成交易订单的发货逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-27 19:42:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						17c93d6a09
					 | 
					
						
						
							
							!310 update README.md. 修改错别字
						
						
						
						
						
						
						
						Merge pull request !310 from strangeKindness/N/A 
						
						
					 | 
					
						2022-11-27 09:12:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e1a05c1374
					 | 
					
						
						
							
							vue3:review 代码生成、文件配置、文件列表、配置管理、访问日志、错误日志、定时任务
						
						
						
						
						
						
					 | 
					
						2022-11-26 23:05:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c5f1cad033
					 | 
					
						
						
							
							vue3:review 短信渠道、短信模板、短信日志、错误码管理、敏感词管理
						
						
						
						
						
						
					 | 
					
						2022-11-26 22:46:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						387cdc4295
					 | 
					
						
						
							
							vue3:review 操作日志、登录日志、令牌管理、客户端管理
						
						
						
						
						
						
					 | 
					
						2022-11-26 22:40:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f168699821
					 | 
					
						
						
							
							vue3:review 部门管理、岗位管理、字典管理
						
						
						
						
						
						
					 | 
					
						2022-11-26 22:28:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ae8795df8e
					 | 
					
						
						
							
							vue3:review 租户列表、租户套餐、用户管理
						
						
						
						
						
						
					 | 
					
						2022-11-26 22:12:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								石溪
							
						 
					 | 
					
						
						
							
						
						7f9fc41555
					 | 
					
						
						
							
							修复上传七牛云无mime type问题
						
						
						
						
						
						
					 | 
					
						2022-11-26 19:26:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						07f1681b50
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-26 18:41:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e96422a47e
					 | 
					
						
						
							
							trade:完成支付成功后的回调,更新订单为已支付
						
						
						
						
						
						
					 | 
					
						2022-11-26 18:40:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						7e5c44b0db
					 | 
					
						
						
							
							docs: 升级依赖
						
						
						
						
						
						
					 | 
					
						2022-11-26 13:20:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						82b70a18f6
					 | 
					
						
						
							
							docs: 增加说明
						
						
						
						
						
						
					 | 
					
						2022-11-26 13:18:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						693288d33d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/vue3
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml 
						
						
					 | 
					
						2022-11-26 13:07:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2d78b02086
					 | 
					
						
						
							
							移除云片短信渠道,解决云片的安全风险
						
						
						
						
						
						
					 | 
					
						2022-11-25 21:04:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ea95115ffd
					 | 
					
						
						
							
							移除云片短信渠道,解决云片的安全风险
						
						
						
						
						
						
					 | 
					
						2022-11-25 20:22:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6548ada025
					 | 
					
						
						
							
							docs: add vxetable
						
						
						
						
						
						
					 | 
					
						2022-11-25 18:02:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						78e3578fe3
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-25 17:57:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1cd9085c59
					 | 
					
						
						
							
							pay: PayNotifyJob 增加多租户的支持
						
						
						
						
						
						
					 | 
					
						2022-11-24 23:56:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						585a576327
					 | 
					
						
						
							
							perf: style
						
						
						
						
						
						
					 | 
					
						2022-11-24 17:05:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shizhong
							
						 
					 | 
					
						
						
							
						
						f478448ec9
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						 Conflicts:
	yudao-ui-admin/yarn.lock 
						
						
					 | 
					
						2022-11-24 15:01:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e187e7a016
					 | 
					
						
						
							
							fix: tenant package select
						
						
						
						
						
						
					 | 
					
						2022-11-24 13:08:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0a6d93fefa
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-24 12:07:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b01606bae6
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-24 00:55:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						914b7dde60
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2022-11-23 23:01:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						61a6039fce
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/vue3
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:55:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0d0f64e30a
					 | 
					
						
						
							
							feat: 删除过期方法
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:54:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						824c54088b
					 | 
					
						
						
							
							perf: add view name
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:26:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0247fd5c69
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-23 21:09:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8798944069
					 | 
					
						
						
							
							优化 pay 支付成功后的回调逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-23 21:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9d05b97451
					 | 
					
						
						
							
							fix: vxe font size
						
						
						
						
						
						
					 | 
					
						2022-11-23 20:36:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |