diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomDayDiamondRewardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomDayDiamondRewardAdminController.java index 32e1b46e6..932aae93a 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomDayDiamondRewardAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomDayDiamondRewardAdminController.java @@ -35,7 +35,7 @@ public class RoomDayDiamondRewardAdminController extends BaseController { @ApiImplicitParam(name = "erbanNo", value = "用户id", required = false, dataType = "long"), @ApiImplicitParam(name = "ownerErbanNo", value = "公会长ID", required = false, dataType = "long"), @ApiImplicitParam(name = "guildId", value = "用户id", required = false, dataType = "int"), - @ApiImplicitParam(name = "status", value = "发放状态:-1:全部,0:未发放,1已经发放", required = false, dataType = "long"), + @ApiImplicitParam(name = "status", value = "发放状态:-1:全部,0:未发放,1已经发放,2当天不可操作", required = false, dataType = "long"), }) @GetMapping("/list") public BusiResult> list(Integer regionId, Long erbanNo, Long ownerErbanNo, Integer guildId, Integer status, BasePageParams pageParams) { @@ -51,7 +51,7 @@ public class RoomDayDiamondRewardAdminController extends BaseController { @ApiImplicitParam(name = "erbanNo", value = "用户id", required = false, dataType = "long"), @ApiImplicitParam(name = "ownerErbanNo", value = "ownerErbanNo", required = false, dataType = "long"), @ApiImplicitParam(name = "guildId", value = "用户id", required = false, dataType = "int"), - @ApiImplicitParam(name = "status", value = "发放状态:-1:全部,0:未发放,1已经发放", required = false, dataType = "long"), + @ApiImplicitParam(name = "status", value = "发放状态:-1:全部,0:未发放,1已经发放,2当天不可操作", required = false, dataType = "long"), }) @GetMapping("/export") public void list(HttpServletResponse response, Integer regionId, Long erbanNo, Long ownerErbanNo, Integer guildId, Integer status, BasePageParams pageParams) throws IOException { diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/room/RoomDayDiamondRewardRecordVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/room/RoomDayDiamondRewardRecordVo.java index 1c53290f5..b3d896608 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/room/RoomDayDiamondRewardRecordVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/room/RoomDayDiamondRewardRecordVo.java @@ -49,8 +49,8 @@ public class RoomDayDiamondRewardRecordVo { @ExcelProperty("领取主播ID") @ApiModelProperty("领取主播ID") private Long receiveErbanNo; - @ExcelProperty("发放状态:0:未发放,1已经发放") - @ApiModelProperty("发放状态:0:未发放,1已经发放") + @ExcelProperty("发放状态:-1全部,0:未发放,1已经发放") + @ApiModelProperty("发放状态:-1全部,0:未发放,1已经发放,2当天不可操作") private Byte status; @ExcelProperty("操作人") @ApiModelProperty("操作人") @@ -58,7 +58,7 @@ public class RoomDayDiamondRewardRecordVo { @ExcelIgnore private Date createTime; @ApiModelProperty("发放时间") - @ExcelProperty("操作人") + @ExcelProperty("发放时间") private String sendTime; @ApiModelProperty("公会长ID") @ExcelProperty("公会长ID")