123

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

@@ -35,9 +35,25 @@ public class VehicleVO extends Vehicle {
     private String manageCompanyName;
 
 
+   @ApiModelProperty("经营店铺联系人")
+   private  String manageCompanyLeader;
+
+
+   @ApiModelProperty("经营店铺联系电话")
+   private  String manageCompanyLeaderContact;
+
+
    @ApiModelProperty("停靠店铺名称")
    private String parkCompanyName;
 
+
+   @ApiModelProperty("停靠店铺联系人")
+   private  String parkCompanyLeader;
+
+
+   @ApiModelProperty("停靠店铺联系电话")
+   private  String parkCompanyLeaderContact;
+
     private VehicleApply vehicleApply;
 
     private  List<VehicleExtensionVO> extensionVOS;

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -1309,7 +1309,11 @@
         bc.`leader_contact_info` as companyLeaderContact,
         bc.`name` as companyName,
         bc1.`name` as manageCompanyName,
-        bc2.`name` as parkCompanyName
+        bc1.`leader` as manageCompanyLeader,
+        bc1.`leader_contact_info` as manageCompanyLeaderContact,
+        bc2.`name` as parkCompanyName,
+        bc2.`leader` as parkCompanyLeader,
+        bc2.`leader_contact_info` as parkCompanyLeaderContact
         FROM  vehicle v
         LEFT JOIN vehicle_brand b ON v.brand_id=b.id
         LEFT JOIN vehicle_category c ON v.category_id=c.id