| 
							
							
								 YunaiV | de7d26129c | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm # Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java | 2023-02-04 20:58:09 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 53767614fe | 增加商城的提示 | 2023-02-04 20:38:51 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c3eb9022b8 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc # Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml | 2023-02-04 10:21:45 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | ee150702b7 | !369 解决只有一个菜单时无法显示目录 Merge pull request !369 from zhang.xionghui/master | 2023-02-04 02:13:45 +00:00 |  | 
			
				
					| 
							
							
								 xingyu | 0bd0bbd536 | fix: slot-scope 已过期 ==》 v-slot | 2023-01-31 13:28:16 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 2ea9027031 | mp user => mp mpuser | 2023-01-31 13:22:26 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 227361661f | fix: mp menu error | 2023-01-31 09:27:27 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 5bedff605a | Merge branch 'feature/vue3-bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm | 2023-01-30 20:48:29 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 08a4de37c2 | Merge remote-tracking branch 'origin/master' into feature/springdoc # Conflicts:
#	README.md | 2023-01-30 10:08:31 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c04ef59e81 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm | 2023-01-30 08:11:24 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ca8bb72417 | 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! | 2023-01-30 02:30:42 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 68bdaa7854 | feat: swagger-ui | 2023-01-29 16:25:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 91dd4a32b1 | 站内信模块:vue3 站内信弹板 | 2023-01-29 09:26:06 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 1943e71e3f | 站内信模块:完善注释 | 2023-01-28 22:59:01 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ae3ee95cdd | 站内信模块:整体功能实现 | 2023-01-28 20:10:19 +08:00 |  | 
			
				
					| 
							
							
								 gexinzhineng/gxzn27 | a03f702fa1 | 修改数据弹出层 | 2023-01-28 11:28:52 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 143035d798 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify # Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js | 2023-01-27 23:25:08 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 86a884e3d2 | 邮箱模块:vue3 邮件模版的管理 | 2023-01-27 17:10:15 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 4cbf7398e8 | 邮箱模块:vue3 邮箱账号的管理 | 2023-01-27 15:11:11 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2c55d29411 | 邮箱模块:完善前端的界面 | 2023-01-27 14:15:45 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c0b029b244 | 邮箱模块:完善 template 的单元测试 | 2023-01-26 23:32:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0895ee7d98 | 邮箱模块:完善 account 的单元测试 | 2023-01-26 23:04:26 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 525078abd3 | 邮箱模块:完善 log 相关的逻辑 | 2023-01-26 20:39:38 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ea39dcc5c8 | 邮箱模块:完善 template 模版的增删改查功能 | 2023-01-25 20:44:48 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0262fa5c15 | 邮箱模块:完善 account 账号的增删改查功能 | 2023-01-25 17:48:09 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | e9814b129b | 492919d:升级element-ui到最新版本2.15.12 | 2023-01-25 12:32:54 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 9b47dd4a67 | b4bdd4f:开启TopNav没有子菜单隐藏侧边栏 | 2023-01-25 12:25:34 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b6d90b2244 | bpm:流程详情的转派审批人 | 2023-01-24 18:55:16 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0aa72b3200 | bpm:流程详情的时间轴 | 2023-01-24 09:20:30 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2d6fe27b43 | bpm:完成流程实例的列表界面 | 2023-01-23 00:03:56 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 5e9706007e | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp # Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java | 2023-01-18 00:38:55 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3166cd7063 | mp:同步 mp 公众号 SQL | 2023-01-17 23:56:27 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 68ef11ee87 | mp:完善微信公众号的消息 | 2023-01-17 23:20:56 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 6fc0b3fc54 | mp:增加【自动回复】的后端新增、修改、删除接口 | 2023-01-17 00:58:35 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 1e402d8063 | mp:增加【自动回复】的前端实现 | 2023-01-17 00:01:07 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ab41c96641 | mp:增加【自动回复】的分页接口 | 2023-01-16 22:16:23 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 26ca97d2f6 | mp:初始化【自动回复】菜单 | 2023-01-15 23:14:46 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0e75a67f28 | mp:菜单的清空处理 | 2023-01-15 21:28:04 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b5815a62fc | mp:自定义菜单的图文选择 | 2023-01-15 21:21:33 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 64fa3a7e47 | mp:修复 wx-reply 组件的 tab 切换存在问题 | 2023-01-15 20:05:25 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 8600214532 | mp:优化【菜单】其它类型的处理 | 2023-01-15 19:52:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3654afedcc | mp:修复 WxMaterialSelect 组件的音乐 tab,无法选择图片素材报错 | 2023-01-15 19:09:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 0499226c3d | mp:完善【菜单】的回复功能 | 2023-01-15 18:28:08 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 141e4e4c8b | mp:移除 less 使用 scss 适配 | 2023-01-15 10:37:42 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2173cf0364 | mp:menu 前端接入菜单的保存、清空操作 | 2023-01-15 00:54:53 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c0b950257f | mp:menu 前端的新增、删除操作的完善 | 2023-01-14 22:39:29 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 02ec5d455c | mp:1)引入 less-loader,解决 menu 的 less 样式;2)接入菜单列表接口 | 2023-01-14 21:24:14 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | f271ef8c47 | mp:初始化菜单的前端 | 2023-01-14 20:07:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | bf5dcdd582 | mp:素材管理,增加【语音】【视频】 | 2023-01-14 16:55:36 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 5a1d02dffd | mp:素材管理,增加【图片】 | 2023-01-14 15:46:35 +08:00 |  |