Kaynağa Gözat

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

zhangxianyu 1 yıl önce
ebeveyn
işleme
7dd8c97d67
40 değiştirilmiş dosya ile 37 ekleme ve 102 silme
  1. 0 1
      game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDto.java
  2. 0 3
      game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgVo.java
  3. 1 1
      game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/rpc/ICPSendMsgRpc.java
  4. 3 3
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleAssignController.java
  5. 2 6
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleGiftController.java
  6. 0 6
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleMailController.java
  7. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAdPolicyBatchStartParam.java
  8. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameGiftAddParam.java
  9. 0 2
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePolicyConfigListParam.java
  10. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameVipAddParam.java
  11. 0 3
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameVipListParam.java
  12. 0 3
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleAssignRecordAddParam.java
  13. 0 2
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleAssignRecordListParam.java
  14. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleGiftRecordListParam.java
  15. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleInfoParam.java
  16. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleMailRecordAddParam.java
  17. 0 4
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleOperateParam.java
  18. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleSysUserAssignParam.java
  19. 1 15
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/rpc/impl/CpSendMsgRpcImpl.java
  20. 1 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameGiftService.java
  21. 2 4
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleAssignRecordService.java
  22. 1 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleGiftRecordService.java
  23. 1 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleMailRecordService.java
  24. 2 3
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameGiftServiceImpl.java
  25. 0 1
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameSupperServiceImpl.java
  26. 2 3
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java
  27. 4 4
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleGiftRecordServiceImpl.java
  28. 2 5
      game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleMailRecordServiceImpl.java
  29. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameAdMonitor.java
  30. 2 3
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameGift.java
  31. 1 2
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameVip.java
  32. 1 3
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleAssignRecord.java
  33. 2 3
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleGiftRecord.java
  34. 2 3
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleMailRecord.java
  35. 1 3
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleOperate.java
  36. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/GameGiftMapper.java
  37. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleAssignRecordMapper.java
  38. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleGiftRecordMapper.java
  39. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleMailRecordMapper.java
  40. 1 1
      game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleOperateMapper.java

+ 0 - 1
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/SendMsgDto.java

@@ -3,7 +3,6 @@ package com.zanxiang.game.module.base.pojo.dto;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data

+ 0 - 3
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/vo/SendMsgVo.java

@@ -1,12 +1,9 @@
 package com.zanxiang.game.module.base.pojo.vo;
 package com.zanxiang.game.module.base.pojo.vo;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.List;
 
 
 @Data
 @Data
 public class SendMsgVo implements Serializable {
 public class SendMsgVo implements Serializable {

+ 1 - 1
game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/rpc/ICPSendMsgRpc.java

@@ -1,9 +1,9 @@
 package com.zanxiang.game.module.base.rpc;
 package com.zanxiang.game.module.base.rpc;
 
 
 import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
 import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
-import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
+import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 
 
 /**
 /**

+ 3 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleAssignController.java

@@ -2,7 +2,9 @@ package com.zanxiang.game.module.manage.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.*;
+import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordAddParam;
+import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordListParam;
+import com.zanxiang.game.module.manage.pojo.params.RoleSysUserAssignParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.manage.service.IRoleAssignRecordService;
 import com.zanxiang.game.module.manage.service.IRoleAssignRecordService;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -13,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import java.util.List;
-
 @Api(tags = {"角色指派记录"})
 @Api(tags = {"角色指派记录"})
 @RestController
 @RestController
 @RequestMapping("/role/assign/record")
 @RequestMapping("/role/assign/record")

+ 2 - 6
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleGiftController.java

@@ -2,17 +2,13 @@ package com.zanxiang.game.module.manage.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.*;
-import com.zanxiang.game.module.manage.pojo.vo.CpVO;
+import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordAddParam;
+import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordListParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
-import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
-import com.zanxiang.game.module.manage.service.ICpService;
 import com.zanxiang.game.module.manage.service.IRoleGiftRecordService;
 import com.zanxiang.game.module.manage.service.IRoleGiftRecordService;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;

+ 0 - 6
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleMailController.java

@@ -2,19 +2,13 @@ package com.zanxiang.game.module.manage.controller;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.params.CpAddUpdateParam;
-import com.zanxiang.game.module.manage.pojo.params.CpListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
-import com.zanxiang.game.module.manage.pojo.vo.CpVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
-import com.zanxiang.game.module.manage.service.ICpService;
 import com.zanxiang.game.module.manage.service.IRoleMailRecordService;
 import com.zanxiang.game.module.manage.service.IRoleMailRecordService;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAdPolicyBatchStartParam.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.List;
-import java.util.Set;
 
 
 /**
 /**
  * @author tianhua
  * @author tianhua

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameGiftAddParam.java

@@ -6,7 +6,6 @@ import lombok.Data;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 
 
 
 @ApiModel
 @ApiModel

+ 0 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GamePolicyConfigListParam.java

@@ -5,8 +5,6 @@ import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotNull;
-
 /**
 /**
  * @author tianhua
  * @author tianhua
  * @version 1.0
  * @version 1.0

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameVipAddParam.java

@@ -3,7 +3,6 @@ package com.zanxiang.game.module.manage.pojo.params;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 

+ 0 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameVipListParam.java

@@ -5,9 +5,6 @@ import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
 /**
 /**
  * @author tianhua
  * @author tianhua
  * @version 1.0
  * @version 1.0

+ 0 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleAssignRecordAddParam.java

@@ -4,11 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 
 
 
 /**
 /**

+ 0 - 2
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleAssignRecordListParam.java

@@ -1,13 +1,11 @@
 package com.zanxiang.game.module.manage.pojo.params;
 package com.zanxiang.game.module.manage.pojo.params;
 
 
 import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
-import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 
 /**
 /**
  * @author shishaosong
  * @author shishaosong

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleGiftRecordListParam.java

@@ -1,7 +1,6 @@
 package com.zanxiang.game.module.manage.pojo.params;
 package com.zanxiang.game.module.manage.pojo.params;
 
 
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
-import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleInfoParam.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 
 
 
 /**
 /**

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleMailRecordAddParam.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;

+ 0 - 4
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleOperateParam.java

@@ -1,14 +1,10 @@
 package com.zanxiang.game.module.manage.pojo.params;
 package com.zanxiang.game.module.manage.pojo.params;
 
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
 
 

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleSysUserAssignParam.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
 
 

+ 1 - 15
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/rpc/impl/CpSendMsgRpcImpl.java

@@ -1,30 +1,16 @@
 package com.zanxiang.game.module.manage.rpc.impl;
 package com.zanxiang.game.module.manage.rpc.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
 import com.zanxiang.game.module.base.pojo.dto.SendMsgDto;
-import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.params.SendMsgTaskParam;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
 import com.zanxiang.game.module.base.pojo.vo.SendMsgVo;
 import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
 import com.zanxiang.game.module.base.rpc.ICPSendMsgRpc;
-import com.zanxiang.game.module.manage.enums.CpSendMsgTaskStatusEnum;
-import com.zanxiang.game.module.manage.enums.CpSendMsgTaskTypeEnum;
-import com.zanxiang.game.module.manage.pojo.vo.CpVO;
+import com.zanxiang.game.module.base.util.PageUtil;
 import com.zanxiang.game.module.manage.service.ICPSendMsgTaskService;
 import com.zanxiang.game.module.manage.service.ICPSendMsgTaskService;
-import com.zanxiang.game.module.mybatis.entity.CpSendMsgTask;
-import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.module.util.pojo.ResultVO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.apache.dubbo.config.annotation.DubboService;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 @DubboService
 @DubboService
 @Slf4j
 @Slf4j

+ 1 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IGameGiftService.java

@@ -1,11 +1,11 @@
 package com.zanxiang.game.module.manage.service;
 package com.zanxiang.game.module.manage.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftAddParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftAddParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftListParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameGiftListVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameGiftListVO;
 import com.zanxiang.game.module.mybatis.entity.GameGift;
 import com.zanxiang.game.module.mybatis.entity.GameGift;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 4
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleAssignRecordService.java

@@ -1,14 +1,12 @@
 package com.zanxiang.game.module.manage.service;
 package com.zanxiang.game.module.manage.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordListParam;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordAddParam;
+import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleSysUserAssignParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleSysUserAssignParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
 
 
 /**
 /**
  * <p>
  * <p>

+ 1 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleGiftRecordService.java

@@ -1,11 +1,11 @@
 package com.zanxiang.game.module.manage.service;
 package com.zanxiang.game.module.manage.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordListParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/IRoleMailRecordService.java

@@ -1,11 +1,11 @@
 package com.zanxiang.game.module.manage.service;
 package com.zanxiang.game.module.manage.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
 import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 2 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameGiftServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.erp.security.util.SecurityUtil;
@@ -11,14 +12,12 @@ import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftAddParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftAddParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftListParam;
 import com.zanxiang.game.module.manage.pojo.params.GameGiftListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameGiftListVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameGiftListVO;
+import com.zanxiang.game.module.manage.service.IGameGiftService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.manage.service.IGameSupperService;
 import com.zanxiang.game.module.manage.service.IGameSupperService;
 import com.zanxiang.game.module.mybatis.entity.GameGift;
 import com.zanxiang.game.module.mybatis.entity.GameGift;
 import com.zanxiang.game.module.mybatis.entity.GameSupper;
 import com.zanxiang.game.module.mybatis.entity.GameSupper;
-import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.game.module.mybatis.mapper.GameGiftMapper;
 import com.zanxiang.game.module.mybatis.mapper.GameGiftMapper;
-import com.zanxiang.game.module.manage.service.IGameGiftService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.exception.BaseException;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameSupperServiceImpl.java

@@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**

+ 2 - 3
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java

@@ -5,20 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.zanxiang.corp.base.pojo.entity.CorpUserChangeRecord;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
-import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordAddParam;
+import com.zanxiang.game.module.manage.pojo.params.RoleAssignRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleInfoAndAgentParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleInfoAndAgentParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleSysUserAssignParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleSysUserAssignParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleAssignRecordListVO;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.manage.service.*;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.mybatis.mapper.RoleAssignRecordMapper;
 import com.zanxiang.game.module.mybatis.mapper.RoleAssignRecordMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.exception.BaseException;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 4 - 4
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleGiftRecordServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.erp.security.util.SecurityUtil;
@@ -13,15 +14,14 @@ import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleGiftRecordListParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleGiftRecordListVO;
-import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
 import com.zanxiang.game.module.manage.service.IGameGiftService;
 import com.zanxiang.game.module.manage.service.IGameGiftService;
 import com.zanxiang.game.module.manage.service.IGameService;
 import com.zanxiang.game.module.manage.service.IGameService;
+import com.zanxiang.game.module.manage.service.IRoleGiftRecordService;
 import com.zanxiang.game.module.manage.service.IRoleOperateService;
 import com.zanxiang.game.module.manage.service.IRoleOperateService;
-import com.zanxiang.game.module.mybatis.entity.*;
+import com.zanxiang.game.module.mybatis.entity.GameGift;
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
+import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.zanxiang.game.module.mybatis.mapper.RoleGiftRecordMapper;
 import com.zanxiang.game.module.mybatis.mapper.RoleGiftRecordMapper;
-import com.zanxiang.game.module.manage.service.IRoleGiftRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 2 - 5
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleMailRecordServiceImpl.java

@@ -4,21 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.ErpServer;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.base.rpc.ISysUserRpc;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordAddParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
 import com.zanxiang.game.module.manage.pojo.params.RoleMailRecordListParam;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
 import com.zanxiang.game.module.manage.pojo.vo.RoleMailRecordListVO;
+import com.zanxiang.game.module.manage.service.IRoleMailRecordService;
 import com.zanxiang.game.module.manage.service.IRoleOperateService;
 import com.zanxiang.game.module.manage.service.IRoleOperateService;
-import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
-import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.zanxiang.game.module.mybatis.mapper.RoleMailRecordMapper;
 import com.zanxiang.game.module.mybatis.mapper.RoleMailRecordMapper;
-import com.zanxiang.game.module.manage.service.IRoleMailRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.module.util.exception.BaseException;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameAdMonitor.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import lombok.*;
 
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 
 /**
 /**
  * 游戏广告监控告警配置表(TGameAdMonitor)实体类
  * 游戏广告监控告警配置表(TGameAdMonitor)实体类

+ 2 - 3
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameGift.java

@@ -3,12 +3,11 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
 /**
  * <p>
  * <p>
  * 游戏礼包表
  * 游戏礼包表

+ 1 - 2
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/GameVip.java

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 import lombok.*;
 
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.io.Serializable;
 
 
 /**
 /**
  * 游戏vip档位表(TGameVip)实体类
  * 游戏vip档位表(TGameVip)实体类

+ 1 - 3
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleAssignRecord.java

@@ -1,14 +1,12 @@
 package com.zanxiang.game.module.mybatis.entity;
 package com.zanxiang.game.module.mybatis.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
 /**
  * <p>
  * <p>
  * 角色指派记录表
  * 角色指派记录表

+ 2 - 3
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleGiftRecord.java

@@ -3,12 +3,11 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
 /**
  * <p>
  * <p>
  * 角色礼包发送记录表
  * 角色礼包发送记录表

+ 2 - 3
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleMailRecord.java

@@ -3,12 +3,11 @@ package com.zanxiang.game.module.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
 /**
  * <p>
  * <p>
  * 角色邮件发送记录表
  * 角色邮件发送记录表

+ 1 - 3
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleOperate.java

@@ -1,13 +1,11 @@
 package com.zanxiang.game.module.mybatis.entity;
 package com.zanxiang.game.module.mybatis.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
-import lombok.*;
-import lombok.experimental.Accessors;
-
 /**
 /**
  * <p>
  * <p>
  * 角色操作表
  * 角色操作表

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/GameGiftMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 package com.zanxiang.game.module.mybatis.mapper;
 
 
-import com.zanxiang.game.module.mybatis.entity.GameGift;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.GameGift;
 
 
 /**
 /**
  * <p>
  * <p>

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleAssignRecordMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 package com.zanxiang.game.module.mybatis.mapper;
 
 
-import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.RoleAssignRecord;
 
 
 /**
 /**
  * <p>
  * <p>

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleGiftRecordMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 package com.zanxiang.game.module.mybatis.mapper;
 
 
-import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.RoleGiftRecord;
 
 
 /**
 /**
  * <p>
  * <p>

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleMailRecordMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 package com.zanxiang.game.module.mybatis.mapper;
 
 
-import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.RoleMailRecord;
 
 
 /**
 /**
  * <p>
  * <p>

+ 1 - 1
game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/mapper/RoleOperateMapper.java

@@ -1,7 +1,7 @@
 package com.zanxiang.game.module.mybatis.mapper;
 package com.zanxiang.game.module.mybatis.mapper;
 
 
-import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.game.module.mybatis.entity.RoleOperate;
 
 
 /**
 /**
  * <p>
  * <p>