|  YunaiV | 9ee9bb4c0e | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml | 2024-09-29 21:46:50 +08:00 | 
				
					
						|  YunaiV | c422a9f88e | 【依赖升级】easyexcel from 3.3.4 to 4.0.3 | 2024-09-29 21:46:39 +08:00 | 
				
					
						|  YunaiV | 9685f43040 | 【依赖降级】mybatis-plus from 3.5.8 to 3.5.7(MyBatis Plus 3.5.8 需要最低 JDK11 版本,无法升级) | 2024-09-29 21:09:22 +08:00 | 
				
					
						|  YunaiV | 132fe68780 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-29 21:07:49 +08:00 | 
				
					
						|  YunaiV | b950aba8a4 | 【依赖升级】mybatis-plus from 3.5.7 to 3.5.8 | 2024-09-29 21:07:39 +08:00 | 
				
					
						|  YunaiV | f319fe8a75 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-29 20:53:39 +08:00 | 
				
					
						|  YunaiV | 63f8a8940a | 【依赖升级】redisson from 3.32.0 to 3.36.0 | 2024-09-29 20:53:20 +08:00 | 
				
					
						|  YunaiV | eebf191692 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-29 20:49:36 +08:00 | 
				
					
						|  YunaiV | 3aaf4459d2 | 【依赖升级】easy-trans from 3.0.5 to 3.0.6 | 2024-09-29 20:49:29 +08:00 | 
				
					
						|  YunaiV | febc81d8a1 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-29 20:45:28 +08:00 | 
				
					
						|  YunaiV | 10f5fb73e0 | 【依赖升级】dm8 from 8.1.3.62 to 8.1.3.140 【依赖升级】opengauss from 5.0.2 to 5.1.0 | 2024-09-29 20:45:04 +08:00 | 
				
					
						|  YunaiV | 5a9958a50d | 【依赖升级】weixin-java from 4.6.0 to 4.6.5.B | 2024-09-29 20:37:56 +08:00 | 
				
					
						|  YunaiV | b1643482b7 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml | 2024-09-29 20:37:25 +08:00 | 
				
					
						|  YunaiV | 7f0bc3d98d | 【移除依赖】weixin-java from 4.6.0 to 4.6.5.B | 2024-09-29 20:36:24 +08:00 | 
				
					
						|  YunaiV | 3a512b2a46 | 【移除依赖】xercesImpl | 2024-09-29 20:33:43 +08:00 | 
				
					
						|  YunaiV | a30451dfe0 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml | 2024-09-29 20:32:37 +08:00 | 
				
					
						|  YunaiV | f1d69e47df | 【移除依赖】xercesImpl | 2024-09-29 20:32:11 +08:00 | 
				
					
						|  YunaiV | 514e27c20e | 【依赖升级】guava from 33.2.1-jre to 33.3.1-jre | 2024-09-29 20:23:36 +08:00 | 
				
					
						|  YunaiV | c870eb1f13 | 【依赖升级】velocity from 2.3 to 2.4 | 2024-09-29 20:19:20 +08:00 | 
				
					
						|  YunaiV | 2f4a5c6c41 | 【依赖升级】hutool from 5.8.29 to 5.8.32 | 2024-09-29 20:14:36 +08:00 | 
				
					
						|  YunaiV | 7f7f7ef4f2 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml | 2024-09-29 20:14:06 +08:00 | 
				
					
						|  YunaiV | e7dba5afa0 | 【依赖升级】hutool from 5.8.29 to 5.8.32 | 2024-09-29 20:13:21 +08:00 | 
				
					
						|  YunaiV | 7a82fb9c1a | 【依赖升级】mapstruct from 1.5.5 to 1.6.2 | 2024-09-29 13:27:27 +08:00 | 
				
					
						|  YunaiV | 867465a6e3 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml | 2024-09-29 13:26:12 +08:00 | 
				
					
						|  YunaiV | fbe53bb8b9 | 【依赖升级】mapstruct from 1.5.5 to 1.6.2 | 2024-09-29 13:25:56 +08:00 | 
				
					
						|  YunaiV | 034dbcae2f | 【依赖升级】jedis-mock from 1.1.2 to 1.1.4 | 2024-09-29 13:15:18 +08:00 | 
				
					
						|  YunaiV | bdfe476f1a | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-29 13:10:44 +08:00 | 
				
					
						|  YunaiV | 3ec48030f1 | 【依赖升级】rocketmq-spring from 2.3.0 to 2.3.1 | 2024-09-29 13:10:37 +08:00 | 
				
					
						|  YunaiV | 281974d9c7 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml | 2024-09-29 13:02:11 +08:00 | 
				
					
						|  YunaiV | 1106a2504a | 【依赖升级】spring boot from 3.3.1 to 3.3.4 【依赖升级】spring boot admin from 3.3.2 to 3.3.3 | 2024-09-29 13:01:54 +08:00 | 
				
					
						|  YunaiV | 34a4959e8a | 【功能优化】网关:增加 dev 配置,方便部署~ | 2024-09-29 08:08:31 +08:00 | 
				
					
						|  YunaiV | 1869e1525e | 【功能优化】报表:jimureport from 1.7.8 to 1.8.1 | 2024-09-20 22:01:55 +08:00 | 
				
					
						|  YunaiV | f6a1f732f6 | 【功能优化】INFRA:代码生成时,默认禁用单元测试的生成,更符合大家的习惯 | 2024-09-19 13:12:15 +08:00 | 
				
					
						|  YunaiV | b91fe96a36 | 【依赖升级】jdk8 版本的 logback 升级到 1.2.13 避免安全漏洞 | 2024-09-17 20:04:02 +08:00 | 
				
					
						|  YunaiV | 3420834078 | 【依赖升级】jdk8 版本的 spring-framework、spring-security 尽量到更高的版本 | 2024-09-17 19:51:51 +08:00 | 
				
					
						|  YunaiV | bb159c27a2 | Merge remote-tracking branch 'origin/master' | 2024-09-17 17:35:26 +08:00 | 
				
					
						|  YunaiV | d48addf459 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-09-17 17:33:22 +08:00 | 
				
					
						|  YunaiV | 94125441af | 【依赖升级】netty from 4.1.111 to 4.1.113 | 2024-09-17 17:33:00 +08:00 | 
				
					
						|  芋道源码 | 3f5c1dd537 | !140 修复发货后订单操作日志快递公司显示错误问题 Merge pull request !140 from 筱龙缘/N/A | 2024-09-17 04:09:17 +00:00 | 
				
					
						|  YunaiV | 736fc93df5 | 【功能修复】多租户下定时任务结果处理都为失败问题 | 2024-09-17 12:04:45 +08:00 | 
				
					
						|  芋道源码 | a739f7e02b | !141 【功能修复】多租户下定时任务结果处理都为失败问题 Merge pull request !141 from Lcp/pr | 2024-09-17 03:59:37 +00:00 | 
				
					
						|  Lcp | 538b5f5d3c | 【功能修复】多租户下定时任务结果处理都为失败问题 | 2024-09-14 22:11:51 +08:00 | 
				
					
						|  筱龙缘 | 74e5d005f7 | 修复发货后订单操作日志快递公司显示错误问题 订单操作日志:已发货,快递公司:{deliveryName},快递单号:90092131231
Signed-off-by: 筱龙缘 <794334212@qq.com> | 2024-09-13 08:25:00 +00:00 | 
				
					
						|  YunaiV | 85020318db | 【功能优化】websocket 允许不传递 token 连接 | 2024-09-12 13:59:49 +08:00 | 
				
					
						|  YunaiV | 5f7e089bd1 | 【功能修复】定时任务在多租户下,没有记录执行的日志结果 | 2024-09-12 13:39:26 +08:00 | 
				
					
						|  YunaiV | 628cfe2296 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java | 2024-09-09 21:10:50 +08:00 | 
				
					
						|  YunaiV | 9a49b84f27 | 【同步】BOOT 和 CLOUD 的功能 | 2024-09-09 21:08:44 +08:00 | 
				
					
						|  YunaiV | 1209a63c18 | 【功能修复】商城:promotion 服务启动失败的问题 | 2024-09-09 20:58:22 +08:00 | 
				
					
						|  YunaiV | edcb29d4c6 | 【同步】BOOT 和 CLOUD 的功能 | 2024-09-07 21:05:27 +08:00 | 
				
					
						|  YunaiV | 7d9785ad79 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/dto/CombinationRecordCreateReqDTO.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java | 2024-09-07 20:57:15 +08:00 |