Merge branch 'patch-shaosong' of GameCenter/game-center into package

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/pojo/vo/BigRVO.java

@@ -119,7 +119,7 @@ public class BigRVO {
     @ApiModelProperty("GS服务天数")
     private Long gsServeDays;
 
-    @ApiModelProperty("服务状态：0：服务中；1：服务完成")
+    @ApiModelProperty("GS服务状态：0：服务中；1：服务完成")
     private Boolean serveStatus;
 
     @ApiModelProperty("角色来源：1：区服指派；2：角色指派")

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsRoleAmountDataParentServiceImpl.java

@@ -153,6 +153,8 @@ public class AdsRoleAmountDataParentServiceImpl extends ServiceImpl<AdsRoleAmoun
                 .and(ADS_ROLE_AMOUNT_DATA_PARENT.SERVER_ID.isNotNull().or(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.SERVER_ID.isNotNull()))
                 .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
                 .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
+                .ge(AdsRoleAmountDataParent::getRoleTime, dto.getRoleCreateDayBegin())
+                .le(AdsRoleAmountDataParent::getRoleTime, dto.getRoleCreateDayEnd())
                 .in(AdsRoleAmountDataParent::getGsId, dto.getGsIdList(), CollectionUtils.isNotEmpty(dto.getGsIdList()))
                 .eq(AdsRoleAmountDataParent::getParentGameId, dto.getParentGameId(), null != dto.getParentGameId())
                 .like(AdsRoleAmountDataParent::getRoleName, dto.getRoleName(), StringUtils.isNotBlank(dto.getRoleName()))