Merge branch 'master-chw' into dev-chw

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehiclePublishReceiveVo.java

 package com.xxfc.platform.vehicle.pojo.vo;
 
 
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,6 +45,10 @@ public class VehiclePublishReceiveVo extends VehiclePublishReceive {
     String receiveCompanyName;
 
 
+    @ApiModelProperty("接单公司")
+    BranchCompany receiveBranchCompany;
+
+
     @ApiModelProperty("发布公司")
     String publishCompanyName;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishGoodsBiz.java

@@ -41,6 +41,9 @@ public class VehiclePublishGoodsBiz extends BaseBiz<VehiclePublishGoodsMapper, V
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
 
 
 
@@ -118,7 +121,7 @@ public class VehiclePublishGoodsBiz extends BaseBiz<VehiclePublishGoodsMapper, V
                     receiveDTO.setIds(idList);
                     receiveVo.setPublishReceiveVos( publishReceiveBiz.getListByIds(receiveDTO));
                 }
-
+                 receiveVo.setReceiveBranchCompany(branchCompanyBiz.selectById(receiveVo.getReceiveCompanyId()));
             }
             publishGoodsVo.setReceiveVos(list);
         }