hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-15 10:41:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

Browse Source 
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
This commit is contained in:
puhui999
2023-08-22 00:46:47 +08:00
parent c2b6c0d72a 800c44a46e
commit 8123354f09
255 changed files with 5475 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
View File

@@ -53,7 +53,9 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
private TradeAfterSaleLogMapper tradeAfterSaleLogMapper;
@MockBean
private TradeOrderUpdateService tradeOrderService;
private TradeOrderUpdateService tradeOrderUpdateService;
@Resource
private TradeOrderQueryService tradeOrderQueryService;
@MockBean
private TradeOrderQueryService tradeOrderQueryService;
@MockBean