Merge remote-tracking branch 'origin/main'

# Conflicts:
#	ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/controller/admin/store/StoreController.java

@@ -7,6 +7,8 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.excel.core.util.ExcelUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
+import com.yc.ship.module.ota.api.OtaDistributorApi;
+import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.otc.controller.admin.store.machine.SellerMachineRespVO;
 import com.yc.ship.module.otc.controller.admin.store.machine.StoreMachineRespVO;
 import com.yc.ship.module.otc.controller.admin.store.machineproduct.StoreMachineProductRespVO;
@@ -59,6 +61,9 @@ public class StoreController {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private OtaDistributorApi otaDistributorApi;
+
 //    @Resource
 //    private ProductApi productApi;
 
@@ -107,6 +112,8 @@ public class StoreController {
         respVO.setCredit(storeCardDO.getCredit());
         StoreCardRespVO cardRespVO = BeanUtils.toBean(storeCardDO, StoreCardRespVO.class);
         respVO.setCardRespVO(cardRespVO);
+        DistributorRespDTO distributor = otaDistributorApi.getDistributorById(store.getAgencyId());
+        respVO.setAgencyName(distributor.getName());
         return success(respVO);
     }