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

zxl

4 天以前 8063ee7eee51bfe25a09428e6efc60f828b270c6

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

@@ -38,8 +38,13 @@
        return customerService.getStoreSelectOptions();
    }

    @ApiOperation(value = "获得客户详情")
    @GetMapping("/{id}")
    public Result getCustomerInfo(@PathVariable String id){
        return customerService.getMember(id);
    }

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