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 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.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/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
..
yudao-common Merge remote-tracking branch 'origin/master' into feature/mall_product 3 years ago
yudao-spring-boot-starter-banner 集成 Go-View 大屏设计器 3 years ago
yudao-spring-boot-starter-biz-data-permission 修复ContextHolder的NPE异常 3 years ago
yudao-spring-boot-starter-biz-dict mall + product:完善商品详情接口 3 years ago
yudao-spring-boot-starter-biz-error-code system:将 api 的方法名的负数都换成 List 3 years ago
yudao-spring-boot-starter-biz-ip 修复单元测试报错 3 years ago
yudao-spring-boot-starter-biz-operatelog boot3:适合 ServletUtils 3 years ago
yudao-spring-boot-starter-biz-pay 修复包名路径错误 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 尝试修复项目第一次打包失败报Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar 3 years ago
yudao-spring-boot-starter-captcha chore: captcha-plus 3 years ago
yudao-spring-boot-starter-desensitize 优化脱敏组件的注释 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 修复 Redis Pub/Sub 广播消费的容器 默认未启动的问题 3 years ago
yudao-spring-boot-starter-mybatis Merge remote-tracking branch 'origin/master' into feature/mall_product 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 !24 【轻量级 PR】:PasswordEncoder 加密复杂度自定义 3 years ago
yudao-spring-boot-starter-test 切换 Mybatis-plus-join 依赖 3 years ago
yudao-spring-boot-starter-web mall + trade:code review 快递计算逻辑 3 years ago
yudao-spring-boot-starter-websocket feat: websocket init 3 years ago
pom.xml feat: 脱敏组件代码规范更新 3 years ago