YunaiV 9c0d0c809a Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product ...

 Conflicts:

	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.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/convert/order/TradeOrderConvert.java

	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java

2023-09-02 00:45:26 +08:00

..

yudao-module-product-api

优化秒杀活动的管理后台代码

2023-08-12 16:05:47 +08:00

yudao-module-product-biz

调整最新图片 url

2023-08-31 20:06:02 +08:00

yudao-module-promotion-api

Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product

2023-09-02 00:45:26 +08:00

yudao-module-promotion-biz

Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product

2023-09-02 00:45:26 +08:00

yudao-module-trade-api

trade: 会员取消订单

2023-09-01 20:37:20 +08:00

yudao-module-trade-biz

Merge branch 'mall_order_cancel' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product

2023-09-02 00:45:26 +08:00

pom.xml

适配 mall 模块的 openapi

2023-02-04 13:06:54 +08:00