Merge remote-tracking branch 'origin/master'

huliguo

3 天以前 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5

 src/main/java/com/linghu/controller/OrderController.java

@@ -137,9 +137,9 @@
     */
    @GetMapping
    @ApiOperation("查询订单列表")
    public ResponseResult<List<Orders>> list(
            @RequestParam(required = false) Integer pageNum,
            @RequestParam(required = false) Integer pageSize,
    public ResponseResult<Page<Orders>> list(
            @RequestParam(required = false,defaultValue = "1") Integer pageNum ,
            @RequestParam(required = false,defaultValue = "10") Integer pageSize ,
            @RequestParam(required = false) String clientName,
            @RequestParam(required = false) Integer status,
            @RequestParam(required = false) String createTime) {
@@ -159,15 +159,9 @@
        }

        // 分页查询
        if (pageNum != null && pageSize != null) {
            Page<Orders> pageInfo = new Page<>(pageNum, pageSize);
            Page<Orders> result = orderService.page(pageInfo, queryWrapper);
            return ResponseResult.success(result.getRecords());
        }

        // 不分页
        List<Orders> list = orderService.list(queryWrapper);
        return ResponseResult.success(list);
            return ResponseResult.success(result);
    }

    @GetMapping("/{orderId}/keywordList")