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

xiangpei

9 天以前 8065107726ad1fc13591c9bc47819207948bc45c

 manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java

@@ -39,7 +39,7 @@
    }


    @ApiOperation(value = "会员分页列表")
    @ApiOperation(value = "客户分页列表")
    @GetMapping
    public Result getByPage(CustomerQuery customerQuery) {
        return customerService.getMemberPage(customerQuery);