From 683d040eb8bcd4abc5b28dc36e687ccad69445c7 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Tue, 23 Sep 2025 14:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E8=81=94=E4=BD=93-=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=9B=BD=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accompany/business/vo/guildsoviet/RoomSovietAdminVo.java | 4 ++++ .../accompany/sqlmappers/RoomExtraDiamondDayMapper.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java index 55b72ddcc..310010f0d 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/RoomSovietAdminVo.java @@ -44,4 +44,8 @@ public class RoomSovietAdminVo { @ApiModelProperty("额外收益发放状态0-未发放，1-已发放") private Byte sendStatus; + @ExcelProperty("国家") + @ApiModelProperty("国家") + private String regionName; + } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml index 7fd258e04..35214cbbd 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomExtraDiamondDayMapper.xml @@ -23,6 +23,7 @@ redd.uid uid, u.erban_no erbanNo, u.nick nick, + r.`name` regionName, min(send_status) sendStatus, sum(redd.diamond_num + redd.lucky_diamond_num) diamondNum, sum(redd.room_extra_num + redd.room_extra_lucky_num) extraDiamondNum