Merge remote-tracking branch 'origin/dev' into dev

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java

@@ -73,7 +73,7 @@ public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper, BuyVehicleF
             if(comanyLeaderVoMap!=null) {
                 BranComanyLeaderVo branComanyLeaderVo = comanyLeaderVoMap.get(buyVehicleForm.getCompanyId());
                 buyVehicleFormPageVo.setLeaderName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getLeader());
-                buyVehicleFormPageVo.setLeaderPhone(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getPhone());
+                buyVehicleFormPageVo.setLeaderPhone(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getLeaderContactInfo());
                 buyVehicleFormPageVo.setCompanyName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getName());
             }
             buyVehicleFormPageVoList.add(buyVehicleFormPageVo);

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopAdminDTO.java

@@ -162,4 +162,7 @@ public class CampsiteShopAdminDTO {
      */
     private List<Integer>  campsiteTagDTOS;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -209,4 +209,8 @@ public class CampsiteShop implements Serializable {
     @Column(name = "sale_state")
     @ApiModelProperty(value = "上下架状态 0-创建状态  1-上架 2-下架")
     private Integer saleState;
+
+    @Column(name = "poster_background")
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

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

@@ -18,7 +18,7 @@ public class BranComanyLeaderVo {
     /**
      * 负责人联系电话
      */
-    private String phone;
+    private String leaderContactInfo;
 
     /**
      * 公司名