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

nightFragrance-massage/src/main/java/com/ylx/order/controller/OrderController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.Map;
 
 @RestController
@@ -41,7 +40,7 @@ public class OrderController {
     @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("根据日期范围等条件查询订单")
     @PostMapping("/queryByDate")
-    public R<Page<OrderDateQueryVo>> queryOrderByDate(@Valid @RequestBody OrderDateQueryDTO dto) {
+    public R<Page<OrderDateQueryVo>> queryOrderByDate(@Validated @RequestBody OrderDateQueryDTO dto) {
         Page<OrderDateQueryVo> page = orderService.queryOrderList(dto);
         return R.ok(page);
     }
@@ -49,7 +48,7 @@ public class OrderController {
     @PreAuthorize("@customerAuth.isCustomer()")
     @ApiOperation("逻辑删除订单（移入回收站）")
     @PostMapping("/delete")
-    public R<?> deleteOrder(@Valid @RequestBody OrderDeleteDTO dto) {
+    public R<?> deleteOrder(@Validated @RequestBody OrderDeleteDTO dto) {
         orderService.logicDeleteOrder(dto.getId());
         return R.ok("删除成功");
     }