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

peng

5 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

 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) {