mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-23 07:41:53 +08:00
f7296d18b9
# Conflicts: # yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/common/PromotionTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/MemberUserRespDTO.java |
||
---|---|---|
.. | ||
yudao-common | ||
yudao-spring-boot-starter-banner | ||
yudao-spring-boot-starter-biz-data-permission | ||
yudao-spring-boot-starter-biz-dict | ||
yudao-spring-boot-starter-biz-error-code | ||
yudao-spring-boot-starter-biz-ip | ||
yudao-spring-boot-starter-biz-operatelog | ||
yudao-spring-boot-starter-biz-pay | ||
yudao-spring-boot-starter-biz-sms | ||
yudao-spring-boot-starter-biz-social | ||
yudao-spring-boot-starter-biz-tenant | ||
yudao-spring-boot-starter-biz-weixin | ||
yudao-spring-boot-starter-captcha | ||
yudao-spring-boot-starter-desensitize | ||
yudao-spring-boot-starter-excel | ||
yudao-spring-boot-starter-file | ||
yudao-spring-boot-starter-flowable | ||
yudao-spring-boot-starter-job | ||
yudao-spring-boot-starter-monitor | ||
yudao-spring-boot-starter-mq | ||
yudao-spring-boot-starter-mybatis | ||
yudao-spring-boot-starter-protection | ||
yudao-spring-boot-starter-redis | ||
yudao-spring-boot-starter-security | ||
yudao-spring-boot-starter-test | ||
yudao-spring-boot-starter-web | ||
yudao-spring-boot-starter-websocket | ||
pom.xml |