YunaiV
							
						 
					 | 
					
						
						
							
						
						03db8fece4
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						 Conflicts:
	src/views/bpm/form/formEditor.vue
	src/views/bpm/model/index.vue
	src/views/infra/config/form.vue
	src/views/infra/config/index.vue
	src/views/infra/fileConfig/index.vue
	src/views/infra/fileList/index.vue
	src/views/system/mail/log/log.data.ts
	src/views/system/tenant/tenant.data.ts
	src/views/system/user/index.vue
	src/views/system/user/user.data.ts 
						
						
					 | 
					
						2023-03-28 23:57:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						696d359f7f
					 | 
					
						
						
							
							!67 Vue3重构:  用户管理
						
						
						
						
						
						
						
						Merge pull request !67 from fessor/dev 
						
						
					 | 
					
						2023-03-28 15:33:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a4dea6c254
					 | 
					
						
						
							
							Vue3 重构:REVIEW 站内信
						
						
						
						
						
						
					 | 
					
						2023-03-28 23:18:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Siyu Kong
							
						 
					 | 
					
						
						
							
						
						b8ce330c12
					 | 
					
						
						
							
							feat: 新增产品分类模块页面&api
						
						
						
						
						
						
					 | 
					
						2023-03-28 20:35:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 
					 | 
					
						
						
							
						
						944015484a
					 | 
					
						
						
							
							1、配合地区管理接口的api文件,后端修改相应字段可以不要此文件
						
						
						
						
						
						
						
						2、基础设施/文件管理/文件列表 上传失败无法上传只能刷新页面才能上传bug
3、基础设施/文件管理/文件列表 新增是下拉框显示0 设置为null 
						
						
					 | 
					
						2023-03-28 11:27:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d7891fe759
					 | 
					
						
						
							
							Vue3 重构:流程实例的创建
						
						
						
						
						
						
					 | 
					
						2023-03-28 08:10:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dlarmor
							
						 
					 | 
					
						
						
							
						
						0c71d0dd93
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2023-03-27 14:15:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dlarmor
							
						 
					 | 
					
						
						
							
						
						636e07fcf6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/infra/codegen/components/BasicInfoForm.vue
#	src/views/infra/codegen/components/ImportTable.vue 
						
						
					 | 
					
						2023-03-27 14:09:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dlarmor
							
						 
					 | 
					
						
						
							
						
						f33935868d
					 | 
					
						
						
							
							Vue3 重构:基础设施 -> 代码生成
						
						
						
						
						
						
					 | 
					
						2023-03-27 14:06:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fessor
							
						 
					 | 
					
						
						
							
						
						1ef6563429
					 | 
					
						
						
							
							Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
						
						
						
						
						
						
						
						Signed-off-by: fessor <352475718@qq.com> 
						
						
					 | 
					
						2023-03-27 04:43:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1a4311309d
					 | 
					
						
						
							
							Vue3 重构:REVIEW 角色管理
						
						
						
						
						
						
					 | 
					
						2023-03-27 12:29:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						581b301eed
					 | 
					
						
						
							
							update: 修复角色管理系列问题,解决页面打不开按钮功能失效等问题!!
						
						
						
						
						
						
					 | 
					
						2023-03-27 12:02:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fessor
							
						 
					 | 
					
						
						
							
						
						3dbcbf4cf0
					 | 
					
						
						
							
							fix: 修改api定义与命名
						
						
						
						
						
						
						
						Signed-off-by: fessor <352475718@qq.com> 
						
						
					 | 
					
						2023-03-27 02:18:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9ab791867a
					 | 
					
						
						
							
							Vue3 重构:REVIEW 公众号消息,先不报错
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:47:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						56e2f21d1a
					 | 
					
						
						
							
							Vue3 重构:REVIEW 菜单
						
						
						
						
						
						
					 | 
					
						2023-03-26 22:15:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9c869dee5f
					 | 
					
						
						
							
							Vue3 重构:REVIEW 敏感词
						
						
						
						
						
						
					 | 
					
						2023-03-26 21:16:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7f8f43aff5
					 | 
					
						
						
							
							!55 敏感词模块 TODO 内容修改
						
						
						
						
						
						
						
						Merge pull request !55 from syd/dev 
						
						
					 | 
					
						2023-03-26 11:49:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f5d900db29
					 | 
					
						
						
							
							Vue3 重构:流程分配规则
						
						
						
						
						
						
					 | 
					
						2023-03-26 19:32:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3c6bf37879
					 | 
					
						
						
							
							Vue3 重构:流程定义列表
						
						
						
						
						
						
					 | 
					
						2023-03-26 08:46:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e83d5914f0
					 | 
					
						
						
							
							Vue3 重构:流程模型的各种操作
						
						
						
						
						
						
					 | 
					
						2023-03-26 00:46:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1854b85b40
					 | 
					
						
						
							
							Vue3 重构:流程模型的列表和新增、修改
						
						
						
						
						
						
					 | 
					
						2023-03-26 00:16:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9e798fb7f8
					 | 
					
						
						
							
							Vue3 重构:去除 modelEditor.vue 冗余代码
						
						
						
						
						
						
					 | 
					
						2023-03-25 18:51:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2abc7eca67
					 | 
					
						
						
							
							Vue3 重构:REVIEW 公众号标签
						
						
						
						
						
						
					 | 
					
						2023-03-25 11:20:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fa32194772
					 | 
					
						
						
							
							Vue3 重构:REVIEW 短信渠道
						
						
						
						
						
						
					 | 
					
						2023-03-25 00:41:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						74aeffec12
					 | 
					
						
						
							
							Vue3 重构:REVIEW 短信模版
						
						
						
						
						
						
					 | 
					
						2023-03-25 00:29:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								syd
							
						 
					 | 
					
						
						
							
						
						21cce9812d
					 | 
					
						
						
							
							update: 敏感词模块提交TODO 内容
						
						
						
						
						
						
					 | 
					
						2023-03-24 23:26:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6b194bb95f
					 | 
					
						
						
							
							Vue3 重构:REVIEW 短信日志
						
						
						
						
						
						
					 | 
					
						2023-03-24 23:07:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2a3fe7d2bc
					 | 
					
						
						
							
							!45 重构:短信模板和短信日志vue2改vue3
						
						
						
						
						
						
						
						Merge pull request !45 from puhui999/master 
						
						
					 | 
					
						2023-03-23 15:56:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4481964182
					 | 
					
						
						
							
							Vue3 重构:REVIEW 登录日志
						
						
						
						
						
						
					 | 
					
						2023-03-23 23:50:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						8e032d988b
					 | 
					
						
						
							
							!41 Vue3 重构:登录日志
						
						
						
						
						
						
						
						Merge pull request !41 from lour6498/dev 
						
						
					 | 
					
						2023-03-23 15:41:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						12b60da942
					 | 
					
						
						
							
							Vue3 重构:REVIEW API 日志
						
						
						
						
						
						
					 | 
					
						2023-03-23 23:37:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3575e6adbb
					 | 
					
						
						
							
							!48 访问日志重构
						
						
						
						
						
						
						
						Merge pull request !48 from oldBaby/dev 
						
						
					 | 
					
						2023-03-23 15:25:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						abbaeabc3a
					 | 
					
						
						
							
							Vue3 重构:重构工作流的表单
						
						
						
						
						
						
					 | 
					
						2023-03-23 22:50:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dtsz
							
						 
					 | 
					
						
						
							
						
						aad57e2840
					 | 
					
						
						
							
							访问日志重构
						
						
						
						
						
						
					 | 
					
						2023-03-23 13:21:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7c92735aff
					 | 
					
						
						
							
							Vue3 重构:REVIEW 租户管理
						
						
						
						
						
						
					 | 
					
						2023-03-23 09:42:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						d44ceda588
					 | 
					
						
						
							
							update: 修改了一些TODO提到的问题
						
						
						
						
						
						
					 | 
					
						2023-03-23 00:08:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5057e755e2
					 | 
					
						
						
							
							Merge remote-tracking branch 'yudao/dev'
						
						
						
						
						
						
					 | 
					
						2023-03-22 23:54:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2d4e7e7d08
					 | 
					
						
						
							
							Vue3 重构:REVIEW 错误日志
						
						
						
						
						
						
					 | 
					
						2023-03-22 22:40:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						944b70c072
					 | 
					
						
						
							
							!43 错误日志重构
						
						
						
						
						
						
						
						Merge pull request !43 from oldBaby/dev 
						
						
					 | 
					
						2023-03-22 14:15:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c424ee76e4
					 | 
					
						
						
							
							Vue3 重构:REVIEW 岗位
						
						
						
						
						
						
					 | 
					
						2023-03-22 22:11:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						67de9fc567
					 | 
					
						
						
							
							Vue3 重构:工作流分组
						
						
						
						
						
						
					 | 
					
						2023-03-22 21:50:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9e2c3476c8
					 | 
					
						
						
							
							add: 短信日志vue2迁移到vue3,使用ts改写
						
						
						
						
						
						
					 | 
					
						2023-03-22 17:52:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dtsz
							
						 
					 | 
					
						
						
							
						
						7d1d87a1ac
					 | 
					
						
						
							
							错误日志重构
						
						
						
						
						
						
					 | 
					
						2023-03-21 20:18:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6e90bbe2e1
					 | 
					
						
						
							
							add: 改造vue2中的短信模板到vue3中
						
						
						
						
						
						
					 | 
					
						2023-03-21 16:29:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lour6498
							
						 
					 | 
					
						
						
							
						
						a750332210
					 | 
					
						
						
							
							Vue3 重构:登录日志
						
						
						
						
						
						
					 | 
					
						2023-03-21 10:01:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7534a08315
					 | 
					
						
						
							
							!39 Vue3重构:错误码管理
						
						
						
						
						
						
						
						Merge pull request !39 from kinlon92/dev 
						
						
					 | 
					
						2023-03-20 00:47:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhangjl
							
						 
					 | 
					
						
						
							
						
						030ecd3137
					 | 
					
						
						
							
							重构:错误码管理
						
						
						
						
						
						
					 | 
					
						2023-03-19 23:20:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						40bd2c57f8
					 | 
					
						
						
							
							Vue3 重构:Review 字典数据界面
						
						
						
						
						
						
					 | 
					
						2023-03-19 22:14:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2b52683e3c
					 | 
					
						
						
							
							!38 完成字典模块
						
						
						
						
						
						
						
						Merge pull request !38 from Theo/master 
						
						
					 | 
					
						2023-03-19 13:32:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1883293553
					 | 
					
						
						
							
							Vue3 重构:令牌管理
						
						
						
						
						
						
					 | 
					
						2023-03-19 20:56:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |