vue-pro/yudao-framework
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
..
yudao-common Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-04 10:48:18 +08:00
yudao-spring-boot-starter-banner feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-biz-data-permission 修复报错的单元测试 2022-12-30 00:27:14 +08:00
yudao-spring-boot-starter-biz-dict feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-biz-error-code feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-biz-ip 修复报错的单元测试 2022-12-30 00:27:14 +08:00
yudao-spring-boot-starter-biz-operatelog refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
yudao-spring-boot-starter-biz-pay 329 修改支付模块>支付过期时间格式化异常(yyyy-MM-ddTHH:mm:ssXXX) 2022-12-29 18:56:55 +08:00
yudao-spring-boot-starter-biz-sms 329 修改支付模块>支付过期时间格式化异常(yyyy-MM-ddTHH:mm:ssXXX) 2022-12-29 18:56:55 +08:00
yudao-spring-boot-starter-biz-social fix: warn 2022-11-30 10:30:58 +08:00
yudao-spring-boot-starter-biz-tenant 优化本地缓存的刷新实现,数据变更时,强制刷新 2022-12-29 00:09:58 +08:00
yudao-spring-boot-starter-biz-weixin feat: 升级依赖 2022-09-20 18:00:43 +08:00
yudao-spring-boot-starter-captcha feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-excel update: springboot 2.6.8 ==> 2.6.9 2022-07-22 11:07:54 +08:00
yudao-spring-boot-starter-file fix: 腾讯 COS 异常,Region 必传 2023-01-02 22:31:15 +08:00
yudao-spring-boot-starter-flowable feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-job feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-monitor feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-mq fix: 解决 redis mq 消息丢失问题 2022-12-27 22:52:19 +08:00
yudao-spring-boot-starter-mybatis Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-12-23 19:12:45 +08:00
yudao-spring-boot-starter-protection feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-redis feat: 适配springboot 2.7 configuration ==> AutoConfiguration 2022-11-30 01:20:20 +08:00
yudao-spring-boot-starter-security fix: WebSecurityConfigurerAdapter 过期 2022-11-30 14:04:47 +08:00
yudao-spring-boot-starter-test product:优化管理后台相关的接口 2022-12-23 18:47:59 +08:00
yudao-spring-boot-starter-web Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-04 10:48:18 +08:00
pom.xml 增加城市库 2022-12-10 00:17:08 +08:00