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

peng

14 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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