Merge branch 'holiday-price' into dev

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

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