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

peng

11 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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

@@ -38,6 +38,11 @@
        return customerService.getStoreSelectOptions();
    }

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

    @ApiOperation(value = "客户分页列表")
    @GetMapping