| 
							
							
								 YunaiV | 5d1abd5f44 | 邮箱模块:完善 send 的单元测试 | 2023-01-27 10:14:15 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | f0d2c7a58a | 邮箱模块:完善 log 的单元测试 | 2023-01-27 09:38:42 +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 | f9ab45df18 | 邮箱模块:完善 log 相关表结构 | 2023-01-26 01:57:57 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | afced9d420 | 邮箱模块:完善发送 send 逻辑 | 2023-01-25 21:32:32 +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 | c9c5a818ec | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 | 2023-01-25 12:40:37 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | c744e115e3 | 简化本地缓存的实现,萌新更容易看懂! | 2023-01-25 10:11:16 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 711a39b8e9 | spring doc:增加模块分组 | 2023-01-19 15:03:46 +08: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 | 13afc3d57a | feat: springdoc | 2023-01-17 21:25:06 +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 | e314a63ee9 | feat: springdoc 代码生成适配 | 2023-01-17 21:18:10 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 8c4bc638a4 | chore: captcha-plus | 2023-01-17 16:57:10 +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 | 860b0301b7 | refactor: captcha-plus | 2023-01-16 11:12:30 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | fffe3008b5 | refactor: captcha-plus | 2023-01-16 10:47:39 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | aaf62982e2 | feat: 优化 captcha 代码 | 2023-01-12 21:51:53 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | d6de233a47 | mp:完成公众号的数据统计前端界面 | 2023-01-08 00:36:25 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 854ba3315c | marge master | 2023-01-04 10:57:19 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 7b98a3f3f3 | Merge remote-tracking branch 'origin/master' into feature/springdoc # Conflicts:
#	README.md
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
#	yudao-server/pom.xml
#	yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java | 2023-01-04 10:48:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 7912a54ebd | 【修复】没有数据权限时,添加/修改用户的唯一手机、账号等字段的校验不正确 | 2022-12-31 17:31:06 +08:00 |  | 
			
				
					| 
							
							
								 dengxiaobing | df2c137fe2 | 清理单元测试 sql 脚本 | 2022-12-30 10:10:43 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | a83b8e8fbc | 修复报错的单元测试 | 2022-12-30 00:27:14 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 8690f2dddd | !341 修改注释中的错别字 Merge pull request !341 from 王添翼/master | 2022-12-29 12:20:56 +00:00 |  | 
			
				
					| 
							
							
								 YunaiV | 1aee4ad00f | 【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时,未处理多租户场景 | 2022-12-29 20:18:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 5a4cc55917 | 【修复】字典类型逻辑删除时,唯一索引冲突的问题 | 2022-12-29 12:52:37 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2c3aaa8d7e | 修复字典数据(system_dict_data)查询操作有问题,会查出不属于本字典类型(dict_type)的数据 | 2022-12-29 00:16:32 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 3443aa6f5f | 优化本地缓存的刷新实现,数据变更时,强制刷新 | 2022-12-29 00:09:58 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 30a4d7d954 | !342 同步最新版本的商城进度 Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp | 2022-12-27 13:39:56 +00:00 |  | 
			
				
					| 
							
							
								 王添翼 | 84b0f33944 | update yudao-module-system-biz/system/controller/admin/user/UserController.java. 修改注释中的错别字“  // 获用户门列表,只要开启状态的”改为“  // 获取用户列表,只要开启状态的”
Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn> | 2022-12-25 13:16:38 +00:00 |  | 
			
				
					| 
							
							
								 YunaiV | 9a5c8a11f5 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 # Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
#	yudao-module-system/yudao-module-system-biz/pom.xml | 2022-12-23 19:38:00 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 92632c046c | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp # Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue | 2022-12-23 19:12:45 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 7a4a6a3046 | product:优化管理后台相关的接口 area:增加地区列表界面 | 2022-12-23 18:47:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 491921d5ae | code review 站内信代码 | 2022-12-23 18:41:41 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | c8f4ba66d1 | fix: 部门更新 log 错误 | 2022-12-23 16:23:40 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | cacefb4eea | feat: knife4j springdoc | 2022-12-22 00:25:22 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 4f2c08f8db | Merge remote-tracking branch 'origin/dev' into feature/springdoc | 2022-12-21 22:46:52 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | ed2d195411 | 站内信开发 | 2022-12-17 16:42:40 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 826a564abd | 站内信开发 | 2022-12-17 16:41:14 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 7f131a3853 | trade:增加用户 App 的订单分页和详情接口 | 2022-12-10 23:06:53 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | a5ec334e53 | fix: 逻辑删除唯一索引冲突的问题 | 2022-12-10 12:02:49 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 9e3ed75772 | fix: 逻辑删除唯一索引冲突的问题 | 2022-12-10 11:59:21 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 67435648b2 | fix: 逻辑删除唯一索引冲突的问题 | 2022-12-10 11:32:46 +08:00 |  |