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

peng

6 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 seller-api/src/main/java/cn/lili/controller/permission/StoreRoleController.java

@@ -46,6 +46,8 @@
        return ResultUtil.data(page);
    }



    @PutMapping("/{roleId}")
    @ApiOperation(value = "编辑店铺角色")
    public ResultMessage<StoreRole> edit(@PathVariable String roleId, StoreRole storeRole) {