Merge branch 'holiday-price' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/VehicleModelCalendarPriceAdminController.java

@@ -30,8 +30,8 @@ public class VehicleModelCalendarPriceAdminController {
     private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
 
     @ApiOperation("车型日历价格设置")
-    @PostMapping("/add_edit/{date}")
-    public ObjectRestResponse<Void> add(@RequestBody List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, @PathVariable(value = "date",required = false) String date ,UserDTO userDTO){
+    @PostMapping("/add_edit")
+    public ObjectRestResponse<Void> add(@RequestBody(required = false) List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, @RequestParam(value = "date",required = false) String date ,UserDTO userDTO){
         vehicleModelCalendarPriceBiz.addVehicleModelCalendarPrice(vehicleModelCalendarPriceSaveDTO,date,userDTO.getId());
         return ObjectRestResponse.succ();
     }