Merge branch 'master-ucc-feature'

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/BranchCompanyListDTO.java

@@ -20,6 +20,7 @@ public class BranchCompanyListDTO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

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

@@ -20,6 +20,7 @@ public class BranchCompanyListVO {
      */
     @ApiModelProperty("分公司名称")
     private String name;
+    private String companyName;
     /**
      * 公司封面
      */

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

@@ -73,6 +73,7 @@
         cb.town_name AS `townName`,
         bc.addr_detail AS `address`,
         bc.NAME AS `name`,
+        cb.name AS `companyName`,
         cb.cover,
         bc.leader,
         bc.leader_contact_info AS `leaderContactInfo`,