Merge branch 'master_chw_publish' into dev-chw

# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePublishReceiveDTO.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

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

@@ -73,8 +73,7 @@ public class VehiclePublishReceiveDTO{
 
     private BigDecimal payAmount;
 
-
-
+    
     private  Long nowTime;
 
 

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

@@ -141,8 +141,8 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                     if (publishGoods == null ){
                         throw  new BaseException("子需求不存在", ResultCode.FAILED_CODE);
                     }
-                    goodsAmount=publishGoods.getReceiveAmount();
-                    payAmount=payAmount.add(goodsAmount);
+                    goodsAmount = publishGoods.getReceiveAmount();
+                    payAmount = payAmount.add(goodsAmount);
                     String cover = publishGoods.getCover();
                     Integer brandId = publishGoods.getBrandId();
                     Integer categoryId = publishGoods.getCategoryId();