YunaiV
							
						 | 
						
							
							
							
							
								
							
								6cf76691a1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feat/optimize_vite
							
							
							
							
							
							
							
							 Conflicts:
	package.json
	src/types/auto-imports.d.ts 
							
						 | 
						
							2023-03-07 19:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Theo
							
						 | 
						
							
							
							
							
								
							
								bc5df9b143
								
							
								
							
						 | 
						
							
							
								
								修复新增或修改菜单时,无法选择菜单图标的bug
							
							
							
							
							
						 | 
						
							2023-03-07 18:44:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								dac20068cc
								
							
								
							
						 | 
						
							
							
								
								系统管理中id显示序号bug
							
							
							
							
							
						 | 
						
							2023-03-07 16:22:40 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								585a667352
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'yudao/master'
							
							
							
							
							
						 | 
						
							2023-03-07 10:34:21 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								cab8c9ad15
								
							
								
							
						 | 
						
							
							
								
								fix: search warn
							
							
							
							
							
						 | 
						
							2023-03-07 10:29:27 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								dd473c02ca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2023-03-07 10:19:40 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								211298c55a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'yudao/master'
							
							
							
							
							
						 | 
						
							2023-03-07 10:12:34 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								50478da759
								
							
								
							
						 | 
						
							
							
								
								chore: up 1.7.1
							
							
							
							
							
						 | 
						
							2023-03-07 10:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								7fea89f5f9
								
							
								
							
						 | 
						
							
							
								
								feat: aotu import
							
							
							
							
							
						 | 
						
							2023-03-07 10:05:45 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								d35d27d197
								
							
								
							
						 | 
						
							
							
								
								fix: devmode
							
							
							
							
							
						 | 
						
							2023-03-07 10:01:29 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								212681a419
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'yudao/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/components/XTable/src/XTable.vue
#	src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue 
							
						 | 
						
							2023-03-07 10:00:25 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								1cde03fbbf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into master
							
							
							
							
							
							
							
							Signed-off-by: puhui999 <puhui999@163.com> 
							
						 | 
						
							2023-03-07 01:48:51 +00:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								004d214a11
								
							
								
							
						 | 
						
							
							
								
								fix: bugs
							
							
							
							
							
						 | 
						
							2023-03-07 09:41:01 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								65e3652534
								
							
								
							
						 | 
						
							
							
								
								style: 抽屉弹出样式问题
							
							
							
							
							
						 | 
						
							2023-03-07 09:38:58 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								01971a94b4
								
							
								
							
						 | 
						
							
							
								
								style: 调整主题切换样式
							
							
							
							
							
						 | 
						
							2023-03-07 09:37:59 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								0cb57e5a51
								
							
								
							
						 | 
						
							
							
								
								dcos: update deps
							
							
							
							
							
						 | 
						
							2023-03-07 09:35:44 +08:00 | 
						
					
				
					
						
							
							
								 
								xingyuv
							
						 | 
						
							
							
							
							
								
							
								4ea5137904
								
							
								
							
						 | 
						
							
							
								
								chore: update deps
							
							
							
							
							
						 | 
						
							2023-03-07 09:33:53 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								19de304f32
								
									
								
							
								
							
						 | 
						
							
							
								
								!17 xTable警告
							
							
							
							
							
							
							
							Merge pull request !17 from 周建/master 
							
						 | 
						
							2023-03-07 00:33:42 +00:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								71219a2f93
								
							
								
							
						 | 
						
							
							
								
								xTable报错
							
							
							
							
							
						 | 
						
							2023-03-06 22:58:05 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								016472b829
								
									
								
							
								
							
						 | 
						
							
							
								
								!16 1.角色提交问题修改 2.XTable var修改
							
							
							
							
							
							
							
							Merge pull request !16 from 毕梅/master 
							
						 | 
						
							2023-03-06 13:51:00 +00:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3af544f1eb
								
									
								
							
								
							
						 | 
						
							
							
								
								!14 补充测试bug
							
							
							
							
							
							
							
							Merge pull request !14 from 周建/master 
							
						 | 
						
							2023-03-06 13:48:37 +00:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								c5d05f1d45
								
							
								
							
						 | 
						
							
							
								
								id警告问题
							
							
							
							
							
						 | 
						
							2023-03-06 20:53:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								28f659f5bc
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
							
						 | 
						
							2023-03-06 19:42:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								68e7b76775
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
							
						 | 
						
							2023-03-06 19:30:06 +08:00 | 
						
					
				
					
						
							
							
								 
								bimei
							
						 | 
						
							
							
							
							
								
							
								ece4cf2760
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3
							
							
							
							
							
						 | 
						
							2023-03-06 18:20:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								cc7fb7e43f
								
							
								
							
						 | 
						
							
							
								
								loading问题
							
							
							
							
							
						 | 
						
							2023-03-06 15:57:06 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								01837ad502
								
							
								
							
						 | 
						
							
							
								
								解决导入css报警告的问题
							
							
							
							
							
							
							
							解决方法来源 https://github.com/vitejs/vite/pull/10762 
							
						 | 
						
							2023-03-06 15:34:38 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								d95de359e3
								
							
								
							
						 | 
						
							
							
								
								解决运行时报Variable 'id' is already declared in the upper scope  vue/no-template-shadow
							
							
							
							
							
						 | 
						
							2023-03-06 15:33:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								269aabd6df
								
							
								
							
						 | 
						
							
							
								
								详情动态表单按钮不显示,我的流程流程分类显示问题
							
							
							
							
							
						 | 
						
							2023-03-06 15:28:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								6b25601936
								
							
								
							
						 | 
						
							
							
								
								手机号必填
							
							
							
							
							
						 | 
						
							2023-03-06 13:29:27 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								cbc21c33b1
								
							
								
							
						 | 
						
							
							
								
								1、解决自定义字典标签值为零时标签不渲染的问题
							
							
							
							
							
							
							
							2、添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题 
							
						 | 
						
							2023-03-06 11:48:39 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								84e802fe93
								
							
								
							
						 | 
						
							
							
								
								使用const let替换掉var
							
							
							
							
							
						 | 
						
							2023-03-06 11:46:40 +08:00 | 
						
					
				
					
						
							
							
								 
								puhui999
							
						 | 
						
							
							
							
							
								
							
								0c34ce1962
								
							
								
							
						 | 
						
							
							
								
								修复编译器全局类型找不到报错的问题
							
							
							
							
							
						 | 
						
							2023-03-06 11:44:33 +08:00 | 
						
					
				
					
						
							
							
								 
								answer.huang
							
						 | 
						
							
							
							
							
								
							
								000b0059c6
								
							
								
							
						 | 
						
							
							
								
								feat: 改用 https,加快首次打开页面
							
							
							
							
							
						 | 
						
							2023-03-05 23:04:20 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								73de987443
								
							
								
							
						 | 
						
							
							
								
								增加 front 环境配置,用于前端同学直接启动
							
							
							
							
							
						 | 
						
							2023-03-05 12:13:07 +08:00 | 
						
					
				
					
						
							
							
								 
								YunaiV
							
						 | 
						
							
							
							
							
								
							
								aa6c50b7d9
								
							
								
							
						 | 
						
							
							
								
								增加 static 演示环境的打包
							
							
							
							
							
						 | 
						
							2023-03-05 02:32:24 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								df5e2f48be
								
									
								
							
								
							
						 | 
						
							
							
								
								!13 解决同事所提pr i12冲突问题
							
							
							
							
							
							
							
							Merge pull request !13 from 周建/master 
							
						 | 
						
							2023-03-04 13:23:40 +00:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								853dab7ffb
								
							
								
							
						 | 
						
							
							
								
								搜索日期显示不全
							
							
							
							
							
						 | 
						
							2023-03-04 16:40:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								8e575f359f
								
							
								
							
						 | 
						
							
							
								
								生成json和options
							
							
							
							
							
						 | 
						
							2023-03-04 16:00:59 +08:00 | 
						
					
				
					
						
							
							
								 
								周建
							
						 | 
						
							
							
							
							
								
							
								fcb9afd3c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into master
							
							
							
							
							
							
							
							Signed-off-by: 周建 <1348660141@qq.com> 
							
						 | 
						
							2023-03-04 05:49:40 +00:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								3c6554c058
								
							
								
							
						 | 
						
							
							
								
								租户和角色管理的菜单权限不能滚动
							
							
							
							
							
						 | 
						
							2023-03-04 13:44:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								cea7b41ae8
								
							
								
							
						 | 
						
							
							
								
								租户和角色管理的菜单权限不能滚动
							
							
							
							
							
							
							
							租户新增菜单权限校验不通过
角色管理详情页不展示对应的部门
XTable中主题颜色不跟随项目主体一起切换 
							
						 | 
						
							2023-03-04 13:19:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								7a5a08d9a2
								
							
								
							
						 | 
						
							
							
								
								租户列表新增校验问题
							
							
							
							
							
						 | 
						
							2023-03-04 10:37:07 +08:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2f98d5c788
								
									
								
							
								
							
						 | 
						
							
							
								
								!11 规范不符合eslint校验规则的代码
							
							
							
							
							
							
							
							Merge pull request !11 from 东方小月/master 
							
						 | 
						
							2023-03-03 16:23:13 +00:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e205995d11
								
									
								
							
								
							
						 | 
						
							
							
								
								!8 fix: 修复el-tree组件setCheckedKeys设置一旦选中父级子级也被选中
							
							
							
							
							
							
							
							Merge pull request !8 from 当时明月在/master-fix-tree 
							
						 | 
						
							2023-03-03 16:21:50 +00:00 | 
						
					
				
					
						
							
							
								 
								芋道源码
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b85046c4e1
								
									
								
							
								
							
						 | 
						
							
							
								
								!7 测试人员所提bug修改
							
							
							
							
							
							
							
							Merge pull request !7 from 周建/master 
							
						 | 
						
							2023-03-03 16:20:14 +00:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								f63bccd1fe
								
							
								
							
						 | 
						
							
							
								
								查看OA请假返回流程详情
							
							
							
							
							
						 | 
						
							2023-03-03 15:27:52 +08:00 | 
						
					
				
					
						
							
							
								 
								bimei
							
						 | 
						
							
							
							
							
								
							
								7c325ee96d
								
							
								
							
						 | 
						
							
							
								
								fix: 主题切换XTable颜色修改
							
							
							
							
							
						 | 
						
							2023-03-03 13:13:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chengyangwang
							
						 | 
						
							
							
							
							
								
							
								0b9022c8a5
								
							
								
							
						 | 
						
							
							
								
								fix: 修复el-tree组件setCheckedKeys设置一旦选中父级子级也被选中
							
							
							
							
							
						 | 
						
							2023-03-03 12:52:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gexinzhineng/gxzn27
							
						 | 
						
							
							
							
							
								
							
								c5cb59f4ba
								
							
								
							
						 | 
						
							
							
								
								任务分配规则页面vxe操作栏显示隐藏bug
							
							
							
							
							
						 | 
						
							2023-03-02 16:46:39 +08:00 |