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

peng

8 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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