You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		3 years ago
..
yudao-common	Merge remote-tracking branch 'origin/master' into feature/springdoc	3 years ago
yudao-spring-boot-starter-banner	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-biz-data-permission	修复报错的单元测试	3 years ago
yudao-spring-boot-starter-biz-dict	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-biz-error-code	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-biz-ip	修复报错的单元测试	3 years ago
yudao-spring-boot-starter-biz-operatelog	refactor: springdoc 替换 springfox	3 years ago
yudao-spring-boot-starter-biz-pay	329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）`	3 years ago
yudao-spring-boot-starter-biz-sms	329 修改`支付模块>支付过期时间格式化异常（yyyy-MM-ddTHH:mm:ssXXX）`	3 years ago
yudao-spring-boot-starter-biz-social	fix: warn	3 years ago
yudao-spring-boot-starter-biz-tenant	优化本地缓存的刷新实现，数据变更时，强制刷新	3 years ago
yudao-spring-boot-starter-biz-weixin	feat: 升级依赖	4 years ago
yudao-spring-boot-starter-captcha	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-excel	update: springboot 2.6.8 ==> 2.6.9	4 years ago
yudao-spring-boot-starter-file	fix: 腾讯 COS 异常，Region 必传	3 years ago
yudao-spring-boot-starter-flowable	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-job	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-monitor	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-mq	fix: 解决 redis mq 消息丢失问题	3 years ago
yudao-spring-boot-starter-mybatis	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp	3 years ago
yudao-spring-boot-starter-protection	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-redis	feat: 适配springboot 2.7 configuration ==> AutoConfiguration	3 years ago
yudao-spring-boot-starter-security	fix: WebSecurityConfigurerAdapter 过期	3 years ago
yudao-spring-boot-starter-test	product：优化管理后台相关的接口	3 years ago
yudao-spring-boot-starter-web	Merge remote-tracking branch 'origin/master' into feature/springdoc	3 years ago
pom.xml	增加城市库	3 years ago