chenchen
							
						 
					 | 
					
						
						
							
						
						2672b3e2fa
					 | 
					
						
						
							
							fix 依赖启动问题
						
						
						
						
						
						
					 | 
					
						2023-06-19 10:19:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						382c3a4699
					 | 
					
						
						
							
							v1.7.3 版本发布啦~~~
						
						
						
						
						
						
					 | 
					
						2023-05-29 23:13:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								walker_lee
							
						 
					 | 
					
						
						
							
						
						39e52cb145
					 | 
					
						
						
							
							fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com/alibaba/excel/support/util/CollectionUtils),详见https://github.com/alibaba/easyexcel/issues/3174
						
						
						
						
						
						
					 | 
					
						2023-05-18 17:30:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						12d6c14b1c
					 | 
					
						
						
							
							!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性
						
						
						
						
						
						
						
						Merge pull request !469 from xingyu/fix/vue3_codegen 
						
						
					 | 
					
						2023-05-15 14:36:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						bb949d991a
					 | 
					
						
						
							
							!481 解决tika库报错
						
						
						
						
						
						
						
						Merge pull request !481 from 灬霍霍/master 
						
						
					 | 
					
						2023-05-15 13:27:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cf61b6056a
					 | 
					
						
						
							
							!474 增加达梦数据库的驱动和SQL文件
						
						
						
						
						
						
					 | 
					
						2023-05-15 21:18:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								灬霍霍
							
						 
					 | 
					
						
						
							
						
						21499a4d40
					 | 
					
						
						
							
							update yudao-dependencies/pom.xml.
						
						
						
						
						
						
						
						解决tika报错,升级common-io到2.11.0
Signed-off-by: 灬霍霍 <416970882@qq.com> 
						
						
					 | 
					
						2023-05-15 01:42:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LiuZijian
							
						 
					 | 
					
						
						
							
						
						8ec0be01a8
					 | 
					
						
						
							
							新增:达梦数据库驱动,KeyGenerator
						
						
						
						
						
						
					 | 
					
						2023-05-09 14:03:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						d25062ec81
					 | 
					
						
						
							
							chore: up springboot 2.7.11
						
						
						
						
						
						
					 | 
					
						2023-05-08 10:04:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						da2810dece
					 | 
					
						
						
							
							chore: up easyexcel 3.3.0
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:36:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						6a4616b6ea
					 | 
					
						
						
							
							chore: up springdoc 1.7.0
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:32:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						235882791f
					 | 
					
						
						
							
							chore: up druid 1.2.17
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:30:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						5b13c07e01
					 | 
					
						
						
							
							chore: up springboot 2.7.11
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:28:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						be01cd4894
					 | 
					
						
						
							
							chore: up mapstruct 1.5.5.Final
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:26:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						023322cb25
					 | 
					
						
						
							
							chore: up hutool 5.8.18
						
						
						
						
						
						
					 | 
					
						2023-05-06 16:24:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						535413804b
					 | 
					
						
						
							
							1.7.2 版本发布
						
						
						
						
						
						
					 | 
					
						2023-04-19 20:44:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						67ac794c62
					 | 
					
						
						
							
							feat: knife4j 4.1.0
						
						
						
						
						
						
					 | 
					
						2023-04-13 17:39:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						7265300f31
					 | 
					
						
						
							
							chore: 升级最新依赖
						
						
						
						
						
						
					 | 
					
						2023-04-13 15:46:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						e3d74b1713
					 | 
					
						
						
							
							chore: 升级最新依赖
						
						
						
						
						
						
					 | 
					
						2023-04-13 15:44:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						844d102a65
					 | 
					
						
						
							
							chore: up springboot 2.7.10
						
						
						
						
						
						
					 | 
					
						2023-04-13 15:43:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						01902c4345
					 | 
					
						
						
							
							chore: up minio 8.5.2
						
						
						
						
						
						
					 | 
					
						2023-04-13 14:53:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						f839f89e93
					 | 
					
						
						
							
							chore: up esayexcel 3.2.1
						
						
						
						
						
						
					 | 
					
						2023-04-13 14:52:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyuv
							
						 
					 | 
					
						
						
							
						
						70f632852b
					 | 
					
						
						
							
							chore: up hutool 5.8.15
						
						
						
						
						
						
					 | 
					
						2023-04-13 14:51:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhs
							
						 
					 | 
					
						
						
							
						
						f9569f910f
					 | 
					
						
						
							
							切换 Mybatis-plus-join 依赖
						
						
						
						
						
						
					 | 
					
						2023-03-13 18:32:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangzhs
							
						 
					 | 
					
						
						
							
						
						670f67e551
					 | 
					
						
						
							
							新增 mybatis-plus-join
						
						
						
						
						
						
					 | 
					
						2023-03-11 17:47:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						47d3f0bc9a
					 | 
					
						
						
							
							1.7.1 版本发布
						
						
						
						
						
						
					 | 
					
						2023-03-05 19:46:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						8c4bdccd48
					 | 
					
						
						
							
							up captcha-plus 1.0.2
						
						
						
						
						
						
					 | 
					
						2023-01-31 09:31:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c6f880bfc1
					 | 
					
						
						
							
							up springboot 2.7.8
						
						
						
						
						
						
					 | 
					
						2023-01-31 09:28:07 +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
							
						 
					 | 
					
						
						
							
						
						ffb0358ce2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/springdoc
						
						
						
						
						
						
					 | 
					
						2023-01-29 16:11:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						756dca6332
					 | 
					
						
						
							
							update: springboot 2.7.8
						
						
						
						
						
						
					 | 
					
						2023-01-29 12:09:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						40f6fed29f
					 | 
					
						
						
							
							update: springboot 2.7.8
						
						
						
						
						
						
					 | 
					
						2023-01-28 09:38:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e7f8e0c507
					 | 
					
						
						
							
							!372 支持 vo 返回脱敏
						
						
						
						
						
						
						
						Merge pull request !372 from 与或非/issues/I3QPZV 
						
						
					 | 
					
						2023-01-19 13:59:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2a332a95f9
					 | 
					
						
						
							
							!376 重构 滑块验证码实现 vue3 自动引入
						
						
						
						
						
						
						
						Merge pull request !376 from xingyu/dev 
						
						
					 | 
					
						2023-01-19 01:24:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f2adb441cd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java 
						
						
					 | 
					
						2023-01-18 15:39:58 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0ef05fba7c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java 
						
						
					 | 
					
						2023-01-17 21:18:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3d390d0d8f
					 | 
					
						
						
							
							feat: knife4j
						
						
						
						
						
						
					 | 
					
						2023-01-17 20:42:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						8c4bc638a4
					 | 
					
						
						
							
							chore: captcha-plus
						
						
						
						
						
						
					 | 
					
						2023-01-17 16:57:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						7b3fca2844
					 | 
					
						
						
							
							feat: 脱敏组件代码规范更新
						
						
						
						
						
						
					 | 
					
						2023-01-17 10:52:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4d35bcef65
					 | 
					
						
						
							
							feat: springdoc success
						
						
						
						
						
						
					 | 
					
						2023-01-16 22:58:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						cba69e94df
					 | 
					
						
						
							
							revert: file
						
						
						
						
						
						
					 | 
					
						2023-01-16 15:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1c0d8fc1eb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java 
						
						
					 | 
					
						2023-01-16 14:25:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b4b23596a5
					 | 
					
						
						
							
							feat: 升级 knife4j 4.0
						
						
						
						
						
						
					 | 
					
						2023-01-16 14:22:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						55db35e31b
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-16 13:43:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						860b0301b7
					 | 
					
						
						
							
							refactor: captcha-plus
						
						
						
						
						
						
					 | 
					
						2023-01-16 11:12:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |