init

ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java

@@ -2,8 +2,8 @@ package com.ruoyi.cai.auth;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
-import com.ruoyi.cai.domain.CaiUser;
+import com.ruoyi.cai.domain.User;
-import com.ruoyi.cai.domain.CaiUserInfo;
+import com.ruoyi.cai.domain.UserInfo;
 import com.ruoyi.cai.executor.ExecutorConstant;
 import com.ruoyi.cai.service.CaiUserInfoService;
 import com.ruoyi.cai.service.CaiUserService;
@@ -34,11 +34,11 @@ public class CaiLoginManager {
 
 
     public String login(String username,String password){
-        CaiUser caiUser = caiUserService.getByUsername(username);
+        User user = caiUserService.getByUsername(username);
-        if(caiUser == null){
+        if(user == null){
             throw new ServiceException("用户不存在或密码错误");
         }
-        if(caiUser.getStatus() != 0){
+        if(user.getStatus() != 0){
             throw new ServiceException("用户已封禁，请联系客服");
         }
         /*if(!BCrypt.checkpw(password, caiUser.getPassword())){
@@ -56,28 +56,28 @@ public class CaiLoginManager {
 //        loginUser.setOs();
         loginUser.setMenuPermission(Collections.emptySet());
         loginUser.setRolePermission(Collections.emptySet());
-        loginUser.setUsername(caiUser.getMobile());
+        loginUser.setUsername(user.getMobile());
         loginUser.setRoles(Collections.emptyList());
         loginUser.setRoleId(null);
-        loginUser.setUserId(caiUser.getId());
+        loginUser.setUserId(user.getId());
         loginUser.setUserType(UserType.APP_USER.getUserType());
         LoginHelper.login(loginUser);
         sysLoginService.recordLogininfor(loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
         String clientIP = ServletUtils.getClientIP();
-        ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(caiUser,clientIP));
+        ExecutorConstant.COMMON_EXECUTOR.execute(() -> recordLoginInfo(user,clientIP));
         return StpUtil.getTokenValue();
     }
 
     @Autowired
     private CaiUserInfoService caiUserInfoService;
 
-    public void recordLoginInfo(CaiUser caiUser,String ip) {
+    public void recordLoginInfo(User user, String ip) {
         String address = AddressUtils.getRealAddressByIP(ip);
-        CaiUserInfo caiUserInfo = caiUserInfoService.getById(caiUser.getId());
+        UserInfo userInfo = caiUserInfoService.getById(user.getId());
-        CaiUserInfo update = new CaiUserInfo();
+        UserInfo update = new UserInfo();
-        update.setUserId(caiUser.getId());
+        update.setUserId(user.getId());
-        update.setLoginCount(caiUserInfo.getLoginCount()+1);
+        update.setLoginCount(userInfo.getLoginCount()+1);
-        update.setPrevLoginTime(caiUserInfo.getLastLoginTime());
+        update.setPrevLoginTime(userInfo.getLastLoginTime());
         update.setLastLoginIp(ip);
         update.setLastLoginTime(LocalDateTime.now());
         update.setLastLocation(address);

ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java

@@ -1,9 +1,9 @@
 package com.ruoyi.cai.chat;
 
 import com.ruoyi.cai.config.CaiProperties;
-import com.ruoyi.cai.domain.CaiAnchor;
+import com.ruoyi.cai.domain.Anchor;
-import com.ruoyi.cai.domain.CaiUser;
+import com.ruoyi.cai.domain.User;
-import com.ruoyi.cai.domain.CaiUserCall;
+import com.ruoyi.cai.domain.UserCall;
 import com.ruoyi.cai.dto.app.dto.GuardNum;
 import com.ruoyi.cai.dto.app.query.CallReq;
 import com.ruoyi.cai.dto.app.vo.chat.CallResp;
@@ -18,7 +18,6 @@ import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.manager.WebSocketManager;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -47,22 +46,22 @@ public class ChatManager {
 
     public CallResp call(CallReq callReq){
         Long userId = LoginHelper.getUserId();
-        CaiUser fromUser = userService.getById(userId);
+        User fromUser = userService.getById(userId);
-        CaiUser toUser = userService.getById(callReq.getToUid());
+        User toUser = userService.getById(callReq.getToUid());
         if(toUser.getIsAnchor() != 1){
             throw new ServiceException("对方未通过女神认证，不能接听视频");
         }
         if(fromUser.getGender() == 1 && toUser.getGender() == 1){
             throw new ServiceException("主播和主播之间，不可以拨打视频哦~");
         }
-        CaiAnchor anchor = anchorService.getByUserId(toUser.getId());
+        Anchor anchor = anchorService.getByUserId(toUser.getId());
         if(anchor == null){
             throw new ServiceException("主播技能不存在");
         }
         Long roomId = null;
         Room room = webSocketManager.checkOnlineRoom(fromUser.getId(), toUser.getId());
         if(room == null){
-            CaiUserCall call = userCallService.createCall(fromUser, toUser, anchor);
+            UserCall call = userCallService.createCall(fromUser, toUser, anchor);
             roomId = webSocketManager.createRoom(call.getId());
         }
         String weSocketUrl = String.format(properties.getWebSocketUrl(),"token",roomId);
@@ -89,7 +88,7 @@ public class ChatManager {
 
     public GetRoomResp getRoom(String roomId){
         Long userId = LoginHelper.getUserId();
-        CaiUserCall userCall = userCallService.getById(roomId);
+        UserCall userCall = userCallService.getById(roomId);
         if(userCall == null){
             throw new ServiceException("房间不存在");
         }
@@ -100,11 +99,11 @@ public class ChatManager {
         if (room == null) {
             throw new ServiceException("'对方已取消通话'");
         }
-        List<CaiUser> userList = userService.listByIds(Arrays.asList(userCall.getFromUid(), userCall.getToUid()));
+        List<User> userList = userService.listByIds(Arrays.asList(userCall.getFromUid(), userCall.getToUid()));
-        Map<Long, CaiUser> userMap = userList.stream().collect(Collectors.toMap(CaiUser::getId, Function.identity()));
+        Map<Long, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, Function.identity()));
-        CaiUser fromUser = userMap.get(userCall.getFromUid());
+        User fromUser = userMap.get(userCall.getFromUid());
-        CaiUser toUser = userMap.get(userCall.getToUid());
+        User toUser = userMap.get(userCall.getToUid());
-        CaiAnchor anchor = anchorService.getByUserId(toUser.getId());
+        Anchor anchor = anchorService.getByUserId(toUser.getId());
         String weSocketUrl = String.format(properties.getWebSocketUrl(),"token",roomId);
         GetRoomResp getRoomResp = new GetRoomResp();
         getRoomResp.setRoomId(userCall.getId()+"");

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiGuardLog;
+import com.ruoyi.cai.domain.GuardLog;
 import com.ruoyi.cai.service.CaiGuardLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiGuardLogController extends BaseController {
      */
     @SaCheckPermission("cai:guardLog:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiGuardLog> list(CaiGuardLog bo, PageQuery pageQuery) {
+    public TableDataInfo<GuardLog> list(GuardLog bo, PageQuery pageQuery) {
-        Page<CaiGuardLog> page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<GuardLog> page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiGuardLogController extends BaseController {
      */
     @SaCheckPermission("cai:guardLog:query")
     @GetMapping("/{id}")
-    public R<CaiGuardLog> getInfo(@NotNull(message = "主键不能为空")
+    public R<GuardLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(iCaiGuardLogService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiGuardLogController extends BaseController {
     @Log(title = "守护赠送流水", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiGuardLog bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody GuardLog bo) {
         return toAjax(iCaiGuardLogService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiGuardLogController extends BaseController {
     @Log(title = "守护赠送流水", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiGuardLog bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) {
         return toAjax(iCaiGuardLogService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBankcardController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountBankcard;
+import com.ruoyi.cai.domain.AccountBankcard;
 import com.ruoyi.cai.service.CaiAccountBankcardService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiAccountBankcardController extends BaseController {
      */
     @SaCheckPermission("cai:accountBankcard:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAccountBankcard> list(CaiAccountBankcard bo, PageQuery pageQuery) {
+    public TableDataInfo<AccountBankcard> list(AccountBankcard bo, PageQuery pageQuery) {
-        Page<CaiAccountBankcard> page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountBankcard> page = accountBankcardService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiAccountBankcardController extends BaseController {
      */
     @SaCheckPermission("cai:accountBankcard:query")
     @GetMapping("/{id}")
-    public R<CaiAccountBankcard> getInfo(@NotNull(message = "主键不能为空")
+    public R<AccountBankcard> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(accountBankcardService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiAccountBankcardController extends BaseController {
     @Log(title = "用户银行卡", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAccountBankcard bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountBankcard bo) {
         return toAjax(accountBankcardService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiAccountBankcardController extends BaseController {
     @Log(title = "用户银行卡", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAccountBankcard bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountBankcard bo) {
         return toAjax(accountBankcardService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountBusinessController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountBusiness;
+import com.ruoyi.cai.domain.AccountBusiness;
 import com.ruoyi.cai.service.CaiAccountBusinessService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiAccountBusinessController extends BaseController {
      */
     @SaCheckPermission("cai:accountBusiness:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAccountBusiness> list(CaiAccountBusiness bo, PageQuery pageQuery) {
+    public TableDataInfo<AccountBusiness> list(AccountBusiness bo, PageQuery pageQuery) {
-        Page<CaiAccountBusiness> page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountBusiness> page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiAccountBusinessController extends BaseController {
      */
     @SaCheckPermission("cai:accountBusiness:query")
     @GetMapping("/{id}")
-    public R<CaiAccountBusiness> getInfo(@NotNull(message = "主键不能为空")
+    public R<AccountBusiness> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiAccountBusinessService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiAccountBusinessController extends BaseController {
     @Log(title = "账户业务", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAccountBusiness bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountBusiness bo) {
         return toAjax(caiAccountBusinessService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiAccountBusinessController extends BaseController {
     @Log(title = "账户业务", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAccountBusiness bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountBusiness bo) {
         return toAjax(caiAccountBusinessService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountCashController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountCash;
+import com.ruoyi.cai.domain.AccountCash;
 import com.ruoyi.cai.service.CaiAccountCashService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -44,8 +44,8 @@ public class CaiAccountCashController extends BaseController {
      */
     @SaCheckPermission("cai:accountCash:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAccountCash> list(CaiAccountCash bo, PageQuery pageQuery) {
+    public TableDataInfo<AccountCash> list(AccountCash bo, PageQuery pageQuery) {
-        Page<CaiAccountCash> page = accountCashService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountCash> page = accountCashService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,9 +55,9 @@ public class CaiAccountCashController extends BaseController {
     @SaCheckPermission("cai:accountCash:export")
     @Log(title = "用户提现记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(CaiAccountCash bo, HttpServletResponse response) {
+    public void export(AccountCash bo, HttpServletResponse response) {
-        List<CaiAccountCash> list = accountCashService.list(Wrappers.lambdaQuery(bo));
+        List<AccountCash> list = accountCashService.list(Wrappers.lambdaQuery(bo));
-        ExcelUtil.exportExcel(list, "用户提现记录", CaiAccountCash.class, response);
+        ExcelUtil.exportExcel(list, "用户提现记录", AccountCash.class, response);
     }
 
     /**
@@ -67,7 +67,7 @@ public class CaiAccountCashController extends BaseController {
      */
     @SaCheckPermission("cai:accountCash:query")
     @GetMapping("/{id}")
-    public R<CaiAccountCash> getInfo(@NotNull(message = "主键不能为空")
+    public R<AccountCash> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(accountCashService.getById(id));
     }
@@ -79,7 +79,7 @@ public class CaiAccountCashController extends BaseController {
     @Log(title = "用户提现记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAccountCash bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountCash bo) {
         return toAjax(accountCashService.save(bo));
     }
 
@@ -90,7 +90,7 @@ public class CaiAccountCashController extends BaseController {
     @Log(title = "用户提现记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAccountCash bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountCash bo) {
         return toAjax(accountCashService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountDetailController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountDetail;
+import com.ruoyi.cai.domain.AccountDetail;
 import com.ruoyi.cai.service.CaiAccountDetailService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiAccountDetailController extends BaseController {
      */
     @SaCheckPermission("cai:accountDetail:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAccountDetail> list(CaiAccountDetail bo, PageQuery pageQuery) {
+    public TableDataInfo<AccountDetail> list(AccountDetail bo, PageQuery pageQuery) {
-        Page<CaiAccountDetail> page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountDetail> page = caiAccountDetailService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiAccountDetailController extends BaseController {
      */
     @SaCheckPermission("cai:accountDetail:query")
     @GetMapping("/{id}")
-    public R<CaiAccountDetail> getInfo(@NotNull(message = "主键不能为空")
+    public R<AccountDetail> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiAccountDetailService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiAccountDetailController extends BaseController {
     @Log(title = "账户明细", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAccountDetail bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountDetail bo) {
         return toAjax(caiAccountDetailService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiAccountDetailController extends BaseController {
     @Log(title = "账户明细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAccountDetail bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountDetail bo) {
         return toAjax(caiAccountDetailService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAccountRechargeController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountRecharge;
+import com.ruoyi.cai.domain.AccountRecharge;
 import com.ruoyi.cai.service.CaiAccountRechargeService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiAccountRechargeController extends BaseController {
      */
     @SaCheckPermission("cai:accountRecharge:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAccountRecharge> list(CaiAccountRecharge bo, PageQuery pageQuery) {
+    public TableDataInfo<AccountRecharge> list(AccountRecharge bo, PageQuery pageQuery) {
-        Page<CaiAccountRecharge> page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountRecharge> page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiAccountRechargeController extends BaseController {
      */
     @SaCheckPermission("cai:accountRecharge:query")
     @GetMapping("/{id}")
-    public R<CaiAccountRecharge> getInfo(@NotNull(message = "主键不能为空")
+    public R<AccountRecharge> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiAccountRechargeService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiAccountRechargeController extends BaseController {
     @Log(title = "充值记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAccountRecharge bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountRecharge bo) {
         return toAjax(caiAccountRechargeService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiAccountRechargeController extends BaseController {
     @Log(title = "充值记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAccountRecharge bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountRecharge bo) {
         return toAjax(caiAccountRechargeService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorApplyController.java

@@ -2,8 +2,8 @@ package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAnchorApply;
+import com.ruoyi.cai.domain.AnchorApply;
-import com.ruoyi.cai.dto.admin.vo.CaiAnchorApplyAdminVo;
+import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo;
 import com.ruoyi.cai.service.CaiAnchorApplyService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiAnchorApplyController extends BaseController {
      */
     @SaCheckPermission("cai:anchorApply:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAnchorApplyAdminVo> list(CaiAnchorApplyAdminVo bo, PageQuery pageQuery) {
+    public TableDataInfo<AnchorApplyAdminVo> list(AnchorApplyAdminVo bo, PageQuery pageQuery) {
-        Page<CaiAnchorApplyAdminVo> page = anchorApplyService.pageAdmin(pageQuery,bo);
+        Page<AnchorApplyAdminVo> page = anchorApplyService.pageAdmin(pageQuery,bo);
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiAnchorApplyController extends BaseController {
      */
     @SaCheckPermission("cai:anchorApply:query")
     @GetMapping("/{id}")
-    public R<CaiAnchorApply> getInfo(@NotNull(message = "主键不能为空")
+    public R<AnchorApply> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(anchorApplyService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiAnchorApplyController extends BaseController {
     @Log(title = "播主申请管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAnchorApply bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AnchorApply bo) {
         return toAjax(anchorApplyService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiAnchorApplyController extends BaseController {
     @Log(title = "播主申请管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAnchorApply bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AnchorApply bo) {
         return toAjax(anchorApplyService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiAnchorController.java

@@ -2,9 +2,8 @@ package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.Anchor;
-import com.ruoyi.cai.domain.CaiAnchor;
+import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
-import com.ruoyi.cai.dto.admin.vo.CaiAnchorAdminVo;
 import com.ruoyi.cai.service.CaiAnchorService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +41,8 @@ public class CaiAnchorController extends BaseController {
      */
     @SaCheckPermission("cai:anchor:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiAnchorAdminVo> list(CaiAnchorAdminVo bo, PageQuery pageQuery) {
+    public TableDataInfo<AnchorAdminVo> list(AnchorAdminVo bo, PageQuery pageQuery) {
-        IPage<CaiAnchorAdminVo> page = caiAnchorService.pageAdmin(pageQuery, bo);
+        IPage<AnchorAdminVo> page = caiAnchorService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +54,7 @@ public class CaiAnchorController extends BaseController {
      */
     @SaCheckPermission("cai:anchor:query")
     @GetMapping("/{id}")
-    public R<CaiAnchor> getInfo(@NotNull(message = "主键不能为空")
+    public R<Anchor> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(caiAnchorService.getById(id));
     }
@@ -67,7 +66,7 @@ public class CaiAnchorController extends BaseController {
     @Log(title = "女神列表", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiAnchor bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Anchor bo) {
         return toAjax(caiAnchorService.save(bo));
     }
 
@@ -78,7 +77,7 @@ public class CaiAnchorController extends BaseController {
     @Log(title = "女神列表", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiAnchor bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Anchor bo) {
         return toAjax(caiAnchorService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiBannerController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiBanner;
+import com.ruoyi.cai.domain.Banner;
 import com.ruoyi.cai.service.CaiBannerService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiBannerController extends BaseController {
      */
     @SaCheckPermission("cai:banner:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiBanner> list(CaiBanner bo, PageQuery pageQuery) {
+    public TableDataInfo<Banner> list(Banner bo, PageQuery pageQuery) {
-        Page<CaiBanner> page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Banner> page = bannerService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -54,7 +54,7 @@ public class CaiBannerController extends BaseController {
      */
     @SaCheckPermission("cai:banner:query")
     @GetMapping("/{id}")
-    public R<CaiBanner> getInfo(@NotNull(message = "主键不能为空")
+    public R<Banner> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(bannerService.getById(id));
     }
@@ -66,7 +66,7 @@ public class CaiBannerController extends BaseController {
     @Log(title = "轮播", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiBanner bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Banner bo) {
         return toAjax(bannerService.save(bo));
     }
 
@@ -77,7 +77,7 @@ public class CaiBannerController extends BaseController {
     @Log(title = "轮播", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiBanner bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Banner bo) {
         return toAjax(bannerService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiDynamicController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiDynamic;
+import com.ruoyi.cai.domain.Dynamic;
 import com.ruoyi.cai.service.CaiDynamicService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiDynamicController extends BaseController {
      */
     @SaCheckPermission("cai:dynamic:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiDynamic> list(CaiDynamic bo, PageQuery pageQuery) {
+    public TableDataInfo<Dynamic> list(Dynamic bo, PageQuery pageQuery) {
-        Page<CaiDynamic> page = caiDynamicService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Dynamic> page = caiDynamicService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiDynamicController extends BaseController {
      */
     @SaCheckPermission("cai:dynamic:query")
     @GetMapping("/{id}")
-    public R<CaiDynamic> getInfo(@NotNull(message = "主键不能为空")
+    public R<Dynamic> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiDynamicService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiDynamicController extends BaseController {
     @Log(title = "主播动态", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiDynamic bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Dynamic bo) {
         return toAjax(caiDynamicService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiDynamicController extends BaseController {
     @Log(title = "主播动态", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiDynamic bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Dynamic bo) {
         return toAjax(caiDynamicService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiftController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiGift;
+import com.ruoyi.cai.domain.Gift;
 import com.ruoyi.cai.service.CaiGiftService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiGiftController extends BaseController {
      */
     @SaCheckPermission("cai:gift:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiGift> list(CaiGift bo, PageQuery pageQuery) {
+    public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) {
-        Page<CaiGift> page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Gift> page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiGiftController extends BaseController {
      */
     @SaCheckPermission("cai:gift:query")
     @GetMapping("/{id}")
-    public R<CaiGift> getInfo(@NotNull(message = "主键不能为空")
+    public R<Gift> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(caiGiftService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiGiftController extends BaseController {
     @Log(title = "礼物", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiGift bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Gift bo) {
         return toAjax(caiGiftService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiGiftController extends BaseController {
     @Log(title = "礼物", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiGift bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Gift bo) {
         return toAjax(caiGiftService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGiveLogController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiGiveLog;
+import com.ruoyi.cai.domain.GiveLog;
 import com.ruoyi.cai.service.CaiGiveLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiGiveLogController extends BaseController {
      */
     @SaCheckPermission("cai:giveLog:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiGiveLog> list(CaiGiveLog bo, PageQuery pageQuery) {
+    public TableDataInfo<GiveLog> list(GiveLog bo, PageQuery pageQuery) {
-        Page<CaiGiveLog> page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<GiveLog> page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiGiveLogController extends BaseController {
      */
     @SaCheckPermission("cai:giveLog:query")
     @GetMapping("/{id}")
-    public R<CaiGiveLog> getInfo(@NotNull(message = "主键不能为空")
+    public R<GiveLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiGiveLogService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiGiveLogController extends BaseController {
     @Log(title = "赠送记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiGiveLog bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody GiveLog bo) {
         return toAjax(caiGiveLogService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiGiveLogController extends BaseController {
     @Log(title = "赠送记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiGiveLog bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody GiveLog bo) {
         return toAjax(caiGiveLogService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiGoodsController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiGoods;
+import com.ruoyi.cai.domain.Goods;
 import com.ruoyi.cai.service.CaiGoodsService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiGoodsController extends BaseController {
      */
     @SaCheckPermission("cai:goods:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiGoods> list(CaiGoods bo, PageQuery pageQuery) {
+    public TableDataInfo<Goods> list(Goods bo, PageQuery pageQuery) {
-        Page<CaiGoods> page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Goods> page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiGoodsController extends BaseController {
      */
     @SaCheckPermission("cai:goods:query")
     @GetMapping("/{id}")
-    public R<CaiGoods> getInfo(@NotNull(message = "主键不能为空")
+    public R<Goods> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiGoodsService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiGoodsController extends BaseController {
     @Log(title = "充值配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiGoods bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Goods bo) {
         return toAjax(caiGoodsService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiGoodsController extends BaseController {
     @Log(title = "充值配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiGoods bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Goods bo) {
         return toAjax(caiGoodsService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiLowHeightRiskController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiLowHeightRisk;
+import com.ruoyi.cai.domain.LowHeightRisk;
-import com.ruoyi.cai.dto.admin.vo.CaiLowHeightRiskAdminVo;
+import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo;
 import com.ruoyi.cai.service.CaiLowHeightRiskService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +41,8 @@ public class CaiLowHeightRiskController extends BaseController {
      */
     @SaCheckPermission("cai:lowHeightRisk:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiLowHeightRiskAdminVo> list(CaiLowHeightRiskAdminVo bo, PageQuery pageQuery) {
+    public TableDataInfo<LowHeightRiskAdminVo> list(LowHeightRiskAdminVo bo, PageQuery pageQuery) {
-        Page<CaiLowHeightRiskAdminVo> page = lowHeightRiskService.pageAdmin(pageQuery, bo);
+        Page<LowHeightRiskAdminVo> page = lowHeightRiskService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +54,7 @@ public class CaiLowHeightRiskController extends BaseController {
      */
     @SaCheckPermission("cai:lowHeightRisk:query")
     @GetMapping("/{id}")
-    public R<CaiLowHeightRisk> getInfo(@NotNull(message = "主键不能为空")
+    public R<LowHeightRisk> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(lowHeightRiskService.getById(id));
     }
@@ -67,7 +66,7 @@ public class CaiLowHeightRiskController extends BaseController {
     @Log(title = "高风险用户记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiLowHeightRisk bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody LowHeightRisk bo) {
         return toAjax(lowHeightRiskService.save(bo));
     }
 
@@ -78,7 +77,7 @@ public class CaiLowHeightRiskController extends BaseController {
     @Log(title = "高风险用户记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiLowHeightRisk bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody LowHeightRisk bo) {
         return toAjax(lowHeightRiskService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportCateController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiReportCate;
+import com.ruoyi.cai.domain.ReportCate;
 import com.ruoyi.cai.service.CaiReportCateService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiReportCateController extends BaseController {
      */
     @SaCheckPermission("cai:reportCate:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiReportCate> list(CaiReportCate bo, PageQuery pageQuery) {
+    public TableDataInfo<ReportCate> list(ReportCate bo, PageQuery pageQuery) {
-        Page<CaiReportCate> page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<ReportCate> page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -54,7 +54,7 @@ public class CaiReportCateController extends BaseController {
      */
     @SaCheckPermission("cai:reportCate:query")
     @GetMapping("/{id}")
-    public R<CaiReportCate> getInfo(@NotNull(message = "主键不能为空")
+    public R<ReportCate> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(caiReportCateService.getById(id));
     }
@@ -66,7 +66,7 @@ public class CaiReportCateController extends BaseController {
     @Log(title = "举报分类", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiReportCate bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ReportCate bo) {
         return toAjax(caiReportCateService.save(bo));
     }
 
@@ -77,7 +77,7 @@ public class CaiReportCateController extends BaseController {
     @Log(title = "举报分类", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiReportCate bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ReportCate bo) {
         return toAjax(caiReportCateService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiReportController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiReport;
+import com.ruoyi.cai.domain.Report;
 import com.ruoyi.cai.service.CaiReportService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiReportController extends BaseController {
      */
     @SaCheckPermission("cai:report:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiReport> list(CaiReport bo, PageQuery pageQuery) {
+    public TableDataInfo<Report> list(Report bo, PageQuery pageQuery) {
-        Page<CaiReport> page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Report> page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiReportController extends BaseController {
      */
     @SaCheckPermission("cai:report:query")
     @GetMapping("/{id}")
-    public R<CaiReport> getInfo(@NotNull(message = "主键不能为空")
+    public R<Report> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiReportService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiReportController extends BaseController {
     @Log(title = "举报", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiReport bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Report bo) {
         return toAjax(caiReportService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiReportController extends BaseController {
     @Log(title = "举报", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiReport bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Report bo) {
         return toAjax(caiReportService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUnion;
+import com.ruoyi.cai.domain.Union;
-import com.ruoyi.cai.dto.admin.vo.CaiUnionAdminVo;
+import com.ruoyi.cai.dto.admin.vo.UnionAdminVo;
 import com.ruoyi.cai.service.CaiUnionService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +41,8 @@ public class CaiUnionController extends BaseController {
      */
     @SaCheckPermission("cai:userUnion:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUnionAdminVo> list(CaiUnionAdminVo bo, PageQuery pageQuery) {
+    public TableDataInfo<UnionAdminVo> list(UnionAdminVo bo, PageQuery pageQuery) {
-        Page<CaiUnionAdminVo> page = caiUnionService.pageAdmin(pageQuery, bo);
+        Page<UnionAdminVo> page = caiUnionService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +54,7 @@ public class CaiUnionController extends BaseController {
      */
     @SaCheckPermission("cai:userUnion:query")
     @GetMapping("/{id}")
-    public R<CaiUnion> getInfo(@NotNull(message = "主键不能为空")
+    public R<Union> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiUnionService.getById(id));
     }
@@ -67,7 +66,7 @@ public class CaiUnionController extends BaseController {
     @Log(title = "工会列表", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUnion bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Union bo) {
         return toAjax(caiUnionService.save(bo));
     }
 
@@ -78,7 +77,7 @@ public class CaiUnionController extends BaseController {
     @Log(title = "工会列表", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUnion bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Union bo) {
         return toAjax(caiUnionService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUnionUserController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUnionUser;
+import com.ruoyi.cai.domain.UnionUser;
 import com.ruoyi.cai.service.CaiUnionUserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUnionUserController extends BaseController {
      */
     @SaCheckPermission("cai:unionUser:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUnionUser> list(CaiUnionUser bo, PageQuery pageQuery) {
+    public TableDataInfo<UnionUser> list(UnionUser bo, PageQuery pageQuery) {
-        Page<CaiUnionUser> page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UnionUser> page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUnionUserController extends BaseController {
      */
     @SaCheckPermission("cai:unionUser:query")
     @GetMapping("/{id}")
-    public R<CaiUnionUser> getInfo(@NotNull(message = "主键不能为空")
+    public R<UnionUser> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiUnionUserService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUnionUserController extends BaseController {
     @Log(title = "123", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUnionUser bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UnionUser bo) {
         return toAjax(caiUnionUserService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUnionUserController extends BaseController {
     @Log(title = "123", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUnionUser bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UnionUser bo) {
         return toAjax(caiUnionUserService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserAlbumController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserAlbum;
+import com.ruoyi.cai.domain.UserAlbum;
 import com.ruoyi.cai.service.CaiUserAlbumService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserAlbumController extends BaseController {
      */
     @SaCheckPermission("cai:userAlbum:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserAlbum> list(CaiUserAlbum bo, PageQuery pageQuery) {
+    public TableDataInfo<UserAlbum> list(UserAlbum bo, PageQuery pageQuery) {
-        Page<CaiUserAlbum> page = userAlbumService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserAlbum> page = userAlbumService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserAlbumController extends BaseController {
      */
     @SaCheckPermission("cai:userAlbum:query")
     @GetMapping("/{id}")
-    public R<CaiUserAlbum> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserAlbum> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(userAlbumService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserAlbumController extends BaseController {
     @Log(title = "主播集锦", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserAlbum bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAlbum bo) {
         return toAjax(userAlbumService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserAlbumController extends BaseController {
     @Log(title = "主播集锦", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserAlbum bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAlbum bo) {
         return toAjax(userAlbumService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCallController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserCall;
+import com.ruoyi.cai.domain.UserCall;
 import com.ruoyi.cai.service.CaiUserCallService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserCallController extends BaseController {
      */
     @SaCheckPermission("cai:userCall:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserCall> list(CaiUserCall bo, PageQuery pageQuery) {
+    public TableDataInfo<UserCall> list(UserCall bo, PageQuery pageQuery) {
-        Page<CaiUserCall> page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserCall> page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserCallController extends BaseController {
      */
     @SaCheckPermission("cai:userCall:query")
     @GetMapping("/{id}")
-    public R<CaiUserCall> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserCall> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiUserCallService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserCallController extends BaseController {
     @Log(title = "通话记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserCall bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCall bo) {
         return toAjax(caiUserCallService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserCallController extends BaseController {
     @Log(title = "通话记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserCall bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCall bo) {
         return toAjax(caiUserCallService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCameraAuditController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserCameraAudit;
+import com.ruoyi.cai.domain.UserCameraAudit;
 import com.ruoyi.cai.service.CaiUserCameraAuditService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserCameraAuditController extends BaseController {
      */
     @SaCheckPermission("cai:userCameraAudit:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserCameraAudit> list(CaiUserCameraAudit bo, PageQuery pageQuery) {
+    public TableDataInfo<UserCameraAudit> list(UserCameraAudit bo, PageQuery pageQuery) {
-        Page<CaiUserCameraAudit> page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserCameraAudit> page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserCameraAuditController extends BaseController {
      */
     @SaCheckPermission("cai:userCameraAudit:query")
     @GetMapping("/{id}")
-    public R<CaiUserCameraAudit> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserCameraAudit> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(caiUserCameraAuditService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserCameraAuditController extends BaseController {
     @Log(title = "自拍认证", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserCameraAudit bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCameraAudit bo) {
         return toAjax(caiUserCameraAuditService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserCameraAuditController extends BaseController {
     @Log(title = "自拍认证", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserCameraAudit bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCameraAudit bo) {
         return toAjax(caiUserCameraAuditService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUser;
+import com.ruoyi.cai.domain.User;
-import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo;
+import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
 import com.ruoyi.cai.service.CaiUserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +41,8 @@ public class CaiUserController extends BaseController {
      */
     @SaCheckPermission("cai:user:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserAdminVo> list(CaiUser query, PageQuery pageQuery) {
+    public TableDataInfo<UserAdminVo> list(User query, PageQuery pageQuery) {
-        Page<CaiUserAdminVo> result = caiUserService.pageAdmin(pageQuery, query);
+        Page<UserAdminVo> result = caiUserService.pageAdmin(pageQuery, query);
         return TableDataInfo.build(result);
     }
 
@@ -54,7 +53,7 @@ public class CaiUserController extends BaseController {
      */
     @SaCheckPermission("cai:user:query")
     @GetMapping("/{id}")
-    public R<CaiUser> getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) {
+    public R<User> getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) {
         return R.ok(caiUserService.getById(id));
     }
 
@@ -65,7 +64,7 @@ public class CaiUserController extends BaseController {
     @Log(title = "用户", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUser bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody User bo) {
         return toAjax(caiUserService.save(bo));
     }
 
@@ -76,7 +75,7 @@ public class CaiUserController extends BaseController {
     @Log(title = "用户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUser bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody User bo) {
         return toAjax(caiUserService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserCountController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserCount;
+import com.ruoyi.cai.domain.UserCount;
 import com.ruoyi.cai.service.CaiUserCountService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserCountController extends BaseController {
      */
     @SaCheckPermission("cai:userCount:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserCount> list(CaiUserCount bo, PageQuery pageQuery) {
+    public TableDataInfo<UserCount> list(UserCount bo, PageQuery pageQuery) {
-        Page<CaiUserCount> page = caiUserCountService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserCount> page = caiUserCountService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -54,7 +54,7 @@ public class CaiUserCountController extends BaseController {
      */
     @SaCheckPermission("cai:userCount:query")
     @GetMapping("/{userId}")
-    public R<CaiUserCount> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserCount> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer userId) {
         return R.ok(caiUserCountService.getById(userId));
     }
@@ -66,7 +66,7 @@ public class CaiUserCountController extends BaseController {
     @Log(title = "用户信息数量统计", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserCount bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCount bo) {
         return toAjax(caiUserCountService.save(bo));
     }
 
@@ -77,7 +77,7 @@ public class CaiUserCountController extends BaseController {
     @Log(title = "用户信息数量统计", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserCount bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCount bo) {
         return toAjax(caiUserCountService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserForbidController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserForbid;
+import com.ruoyi.cai.domain.UserForbid;
 import com.ruoyi.cai.service.CaiUserForbidService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserForbidController extends BaseController {
      */
     @SaCheckPermission("cai:userForbid:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserForbid> list(CaiUserForbid bo, PageQuery pageQuery) {
+    public TableDataInfo<UserForbid> list(UserForbid bo, PageQuery pageQuery) {
-        Page<CaiUserForbid> page = userForbidService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserForbid> page = userForbidService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserForbidController extends BaseController {
      */
     @SaCheckPermission("cai:userForbid:query")
     @GetMapping("/{id}")
-    public R<CaiUserForbid> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserForbid> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(userForbidService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserForbidController extends BaseController {
     @Log(title = "封号列表", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserForbid bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserForbid bo) {
         return toAjax(userForbidService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserForbidController extends BaseController {
     @Log(title = "封号列表", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserForbid bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserForbid bo) {
         return toAjax(userForbidService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserInviteController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserInvite;
+import com.ruoyi.cai.domain.UserInvite;
 import com.ruoyi.cai.service.CaiUserInviteService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserInviteController extends BaseController {
      */
     @SaCheckPermission("cai:userInvite:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserInvite> list(CaiUserInvite bo, PageQuery pageQuery) {
+    public TableDataInfo<UserInvite> list(UserInvite bo, PageQuery pageQuery) {
-        Page<CaiUserInvite> page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserInvite> page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserInviteController extends BaseController {
      */
     @SaCheckPermission("cai:userInvite:query")
     @GetMapping("/{id}")
-    public R<CaiUserInvite> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserInvite> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiUserInviteService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserInviteController extends BaseController {
     @Log(title = "用户邀请", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserInvite bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserInvite bo) {
         return toAjax(caiUserInviteService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserInviteController extends BaseController {
     @Log(title = "用户邀请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserInvite bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) {
         return toAjax(caiUserInviteService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserMemberController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserMember;
+import com.ruoyi.cai.domain.UserMember;
-import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo;
+import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
 import com.ruoyi.cai.service.CaiUserMemberService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -42,8 +41,8 @@ public class CaiUserMemberController extends BaseController {
      */
     @SaCheckPermission("cai:userMember:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserMemberAdminVo> list(CaiUserMemberAdminVo bo, PageQuery pageQuery) {
+    public TableDataInfo<UserMemberAdminVo> list(UserMemberAdminVo bo, PageQuery pageQuery) {
-        Page<CaiUserMemberAdminVo> page = userMemberService.pageAdmin(pageQuery, bo);
+        Page<UserMemberAdminVo> page = userMemberService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +54,7 @@ public class CaiUserMemberController extends BaseController {
      */
     @SaCheckPermission("cai:userMember:query")
     @GetMapping("/{id}")
-    public R<CaiUserMember> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserMember> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
         return R.ok(userMemberService.getById(id));
     }
@@ -67,7 +66,7 @@ public class CaiUserMemberController extends BaseController {
     @Log(title = "会员管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserMember bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserMember bo) {
         return toAjax(userMemberService.save(bo));
     }
 
@@ -78,7 +77,7 @@ public class CaiUserMemberController extends BaseController {
     @Log(title = "会员管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserMember bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserMember bo) {
         return toAjax(userMemberService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserRiskLogController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserRiskLog;
+import com.ruoyi.cai.domain.UserRiskLog;
 import com.ruoyi.cai.service.CaiUserRiskLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserRiskLogController extends BaseController {
      */
     @SaCheckPermission("cai:userRiskLog:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserRiskLog> list(CaiUserRiskLog bo, PageQuery pageQuery) {
+    public TableDataInfo<UserRiskLog> list(UserRiskLog bo, PageQuery pageQuery) {
-        Page<CaiUserRiskLog> page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserRiskLog> page = userRiskLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -54,7 +54,7 @@ public class CaiUserRiskLogController extends BaseController {
      */
     @SaCheckPermission("cai:userRiskLog:query")
     @GetMapping("/{id}")
-    public R<CaiUserRiskLog> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserRiskLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(userRiskLogService.getById(id));
     }
@@ -66,7 +66,7 @@ public class CaiUserRiskLogController extends BaseController {
     @Log(title = "高风险操作日志", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserRiskLog bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserRiskLog bo) {
         return toAjax(userRiskLogService.save(bo));
     }
 
@@ -77,7 +77,7 @@ public class CaiUserRiskLogController extends BaseController {
     @Log(title = "高风险操作日志", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserRiskLog bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserRiskLog bo) {
         return toAjax(userRiskLogService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiUserVisitorController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiUserVisitor;
+import com.ruoyi.cai.domain.UserVisitor;
 import com.ruoyi.cai.service.CaiUserVisitorService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiUserVisitorController extends BaseController {
      */
     @SaCheckPermission("cai:userVisitor:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiUserVisitor> list(CaiUserVisitor bo, PageQuery pageQuery) {
+    public TableDataInfo<UserVisitor> list(UserVisitor bo, PageQuery pageQuery) {
-        Page<CaiUserVisitor> page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserVisitor> page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiUserVisitorController extends BaseController {
      */
     @SaCheckPermission("cai:userVisitor:query")
     @GetMapping("/{id}")
-    public R<CaiUserVisitor> getInfo(@NotNull(message = "主键不能为空")
+    public R<UserVisitor> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiUserVisitorService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiUserVisitorController extends BaseController {
     @Log(title = "用户来访记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiUserVisitor bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVisitor bo) {
         return toAjax(caiUserVisitorService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiUserVisitorController extends BaseController {
     @Log(title = "用户来访记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiUserVisitor bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserVisitor bo) {
         return toAjax(caiUserVisitorService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/CaiWithdrawExchangeController.java

@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiWithdrawExchange;
+import com.ruoyi.cai.domain.WithdrawExchange;
 import com.ruoyi.cai.service.CaiWithdrawExchangeService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +41,8 @@ public class CaiWithdrawExchangeController extends BaseController {
      */
     @SaCheckPermission("cai:withdrawExchange:list")
     @GetMapping("/list")
-    public TableDataInfo<CaiWithdrawExchange> list(CaiWithdrawExchange bo, PageQuery pageQuery) {
+    public TableDataInfo<WithdrawExchange> list(WithdrawExchange bo, PageQuery pageQuery) {
-        Page<CaiWithdrawExchange> page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<WithdrawExchange> page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -53,7 +53,7 @@ public class CaiWithdrawExchangeController extends BaseController {
      */
     @SaCheckPermission("cai:withdrawExchange:query")
     @GetMapping("/{id}")
-    public R<CaiWithdrawExchange> getInfo(@NotNull(message = "主键不能为空")
+    public R<WithdrawExchange> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(caiWithdrawExchangeService.getById(id));
     }
@@ -65,7 +65,7 @@ public class CaiWithdrawExchangeController extends BaseController {
     @Log(title = "提现 - 兑换配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiWithdrawExchange bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WithdrawExchange bo) {
         return toAjax(caiWithdrawExchangeService.save(bo));
     }
 
@@ -76,7 +76,7 @@ public class CaiWithdrawExchangeController extends BaseController {
     @Log(title = "提现 - 兑换配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiWithdrawExchange bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WithdrawExchange bo) {
         return toAjax(caiWithdrawExchangeService.updateById(bo));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.controller.app;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiBanner;
+import com.ruoyi.cai.domain.Banner;
 import com.ruoyi.cai.dto.app.query.AnchorListQuery;
 import com.ruoyi.cai.dto.app.query.UserQuery;
 import com.ruoyi.cai.dto.app.vo.AnchorListVo;
@@ -44,7 +44,7 @@ public class IndexController {
     @GetMapping("/banner")
     @Operation(summary = "获取首页banner图")
     public R<List<IndexBannerVo>> banner(){
-        List<CaiBanner> res = bannerService.index();
+        List<Banner> res = bannerService.index();
         return R.ok(BeanConvertUtil.convertListTo(res, IndexBannerVo::new));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java

@@ -34,25 +34,25 @@ public class SettingAppController {
 
     @GetMapping("/goods")
     @Operation(summary = "充值配置")
-    public R<List<CaiGoods>> goods(){
+    public R<List<Goods>> goods(){
-        List<CaiGoods> list = goodsService.list(Wrappers.lambdaQuery(CaiGoods.class)
+        List<Goods> list = goodsService.list(Wrappers.lambdaQuery(Goods.class)
-                .eq(CaiGoods::getStatus,0)
+                .eq(Goods::getStatus,0)
-                .orderByAsc(CaiGoods::getPrice));
+                .orderByAsc(Goods::getPrice));
         return R.ok(list);
     }
 
     @GetMapping("/withdraw")
     @Operation(summary = "提现配置")
-    public R<List<CaiWithdrawExchange>> withdraw(){
+    public R<List<WithdrawExchange>> withdraw(){
-        List<CaiWithdrawExchange> list = withdrawExchangeService.list(Wrappers.lambdaQuery(CaiWithdrawExchange.class)
+        List<WithdrawExchange> list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class)
-                .orderByAsc(CaiWithdrawExchange::getMoney));
+                .orderByAsc(WithdrawExchange::getMoney));
         return R.ok(list);
     }
 
     @GetMapping("/report")
     @Operation(summary = "举报分类配置")
-    public R<List<CaiReportCate>> report(){
+    public R<List<ReportCate>> report(){
-        List<CaiReportCate> list = reportCateService.list(Wrappers.lambdaQuery(CaiReportCate.class));
+        List<ReportCate> list = reportCateService.list(Wrappers.lambdaQuery(ReportCate.class));
         return R.ok(list);
     }
 
@@ -66,7 +66,7 @@ public class SettingAppController {
     @GetMapping("/gift")
     @Operation(summary = "礼物配置")
     public R<List<GiftVo>> gift(){
-        List<CaiGift> res = giftService.all();
+        List<Gift> res = giftService.all();
         return R.ok(BeanConvertUtil.convertListTo(res, GiftVo::new));
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java

@@ -2,9 +2,9 @@ package com.ruoyi.cai.controller.app;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAccountBankcard;
+import com.ruoyi.cai.domain.AccountBankcard;
-import com.ruoyi.cai.domain.CaiAccountCash;
+import com.ruoyi.cai.domain.AccountCash;
-import com.ruoyi.cai.domain.CaiAccountRecharge;
+import com.ruoyi.cai.domain.AccountRecharge;
 import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
 import com.ruoyi.cai.dto.app.query.WithdrawReq;
 import com.ruoyi.cai.dto.app.vo.AccountCashVo;
@@ -42,8 +42,8 @@ public class WalletController {
 
     @GetMapping("/aliInfo")
     @Operation(summary = "获取绑定支付宝信息")
-    public R<CaiAccountBankcard> aliInfo(){
+    public R<AccountBankcard> aliInfo(){
-        CaiAccountBankcard accountBankcard = currentUserManager.aliInfo();
+        AccountBankcard accountBankcard = currentUserManager.aliInfo();
         return R.ok(accountBankcard);
     }
 
@@ -66,9 +66,9 @@ public class WalletController {
     @Operation(summary = "充值记录-分页")
     public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
         Long userId = LoginHelper.getUserId();
-        Page<CaiAccountRecharge> page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(CaiAccountRecharge.class)
+        Page<AccountRecharge> page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(AccountRecharge.class)
-                .eq(CaiAccountRecharge::getUserId, userId)
+                .eq(AccountRecharge::getUserId, userId)
-                .orderByDesc(CaiAccountRecharge::getCreateTime));
+                .orderByDesc(AccountRecharge::getCreateTime));
         return TableDataInfo.build(page,AccountRechargeVo::new);
     }
 
@@ -76,9 +76,9 @@ public class WalletController {
     @Operation(summary = "提现记录-分页")
     public TableDataInfo<AccountCashVo> cashLog(PageQuery query){
         Long userId = LoginHelper.getUserId();
-        Page<CaiAccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(CaiAccountCash.class)
+        Page<AccountCash> page = accountCashService.page(query.build(), Wrappers.lambdaQuery(AccountCash.class)
-                .eq(CaiAccountCash::getUserId, userId)
+                .eq(AccountCash::getUserId, userId)
-                .orderByDesc(CaiAccountCash::getCreateTime));
+                .orderByDesc(AccountCash::getCreateTime));
         return TableDataInfo.build(page,AccountCashVo::new);
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Account.java

@@ -2,15 +2,11 @@ package com.ruoyi.cai.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.math.BigDecimal;
 
-import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
-
 /**
  * 用户账户对象 cai_account
  *
@@ -19,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @Data
 @TableName("cai_account")
-public class CaiAccount implements Serializable {
+public class Account implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBankcard.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Data
 @TableName("cai_account_bankcard")
 @Schema(description = "用户银行卡对象")
-public class CaiAccountBankcard implements Serializable {
+public class AccountBankcard implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountBusiness.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_account_business")
-public class CaiAccountBusiness implements Serializable {
+public class AccountBusiness implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountCash.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_account_cash")
-public class CaiAccountCash implements Serializable {
+public class AccountCash implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountDetail.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_account_detail")
-public class CaiAccountDetail implements Serializable {
+public class AccountDetail implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountRecharge.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_account_recharge")
-public class CaiAccountRecharge implements Serializable {
+public class AccountRecharge implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Anchor.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_anchor")
-public class CaiAnchor implements Serializable{
+public class Anchor implements Serializable{
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AnchorApply.java

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 播主申请管理对象 cai_anchor_apply
@@ -16,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @TableName("cai_anchor_apply")
-public class CaiAnchorApply implements Serializable {
+public class AnchorApply implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Area.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_area")
-public class CaiArea implements Serializable {
+public class Area implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Banner.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_banner")
-public class CaiBanner implements Serializable {
+public class Banner implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java

@@ -158,7 +158,7 @@ public class CaiConsumeLog implements Serializable {
 
     private LocalDateTime createTime;
 
-    public void init(CaiUser fromUser,CaiUser toUser){
+    public void init(User fromUser, User toUser){
         this.setSourceUserId(fromUser.getId());
         this.setSourcePhone(fromUser.getMobile());
         this.setSourceUsercode(fromUser.getUsercode());

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Citys.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_citys")
-public class CaiCitys implements Serializable {
+public class Citys implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Dynamic.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_dynamic")
-public class CaiDynamic implements Serializable {
+public class Dynamic implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/DynamicImages.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_dynamic_images")
-public class CaiDynamicImages implements Serializable {
+public class DynamicImages implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_gift")
-public class CaiGift implements Serializable {
+public class Gift implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GiveLog.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_give_log")
-public class CaiGiveLog implements Serializable {
+public class GiveLog implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Goods.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @TableName("cai_goods")
-public class CaiGoods implements Serializable {
+public class Goods implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_guard_log")
-public class CaiGuardLog implements Serializable {
+public class GuardLog implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_guard_total")
-public class CaiGuardTotal implements Serializable {
+public class GuardTotal implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LowHeightRisk.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_low_height_risk")
-public class CaiLowHeightRisk implements Serializable {
+public class LowHeightRisk implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_member_skill")
-public class CaiMemberSkill implements Serializable {
+public class MemberSkill implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Report.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_report")
-public class CaiReport implements Serializable {
+public class Report implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/ReportCate.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_report_cate")
-public class CaiReportCate implements Serializable {
+public class ReportCate implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Union.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_union")
-public class CaiUnion implements Serializable {
+public class Union implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UnionUser.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_union_user")
-public class CaiUnionUser implements Serializable {
+public class UnionUser implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user")
-public class CaiUser implements Serializable {
+public class User implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserAlbum.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_album")
-public class CaiUserAlbum implements Serializable {
+public class UserAlbum implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserBlacklist.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_blacklist")
-public class CaiUserBlacklist implements Serializable {
+public class UserBlacklist implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_call")
-public class CaiUserCall implements Serializable {
+public class UserCall implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCameraAudit.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_user_camera_audit")
-public class CaiUserCameraAudit implements Serializable {
+public class UserCameraAudit implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCodeGen.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_user_code_gen")
-public class CaiUserCodeGen implements Serializable {
+public class UserCodeGen implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCount.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_count")
-public class CaiUserCount implements Serializable {
+public class UserCount implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollow.java

@@ -2,13 +2,9 @@ package com.ruoyi.cai.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 关注表对象 cai_user_follow
@@ -18,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @Data
 @TableName("cai_user_follow")
-public class CaiUserFollow implements Serializable {
+public class UserFollow implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserFollowDynamic.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_follow_dynamic")
-public class CaiUserFollowDynamic implements Serializable {
+public class UserFollowDynamic implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserForbid.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_forbid")
-public class CaiUserForbid implements Serializable {
+public class UserForbid implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_gift")
-public class CaiUserGift implements Serializable {
+public class UserGift implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java

@@ -2,14 +2,9 @@ package com.ruoyi.cai.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.math.BigDecimal;
 
+import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 用户信息对象 cai_user_info
@@ -19,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  */
 @Data
 @TableName("cai_user_info")
-public class CaiUserInfo {
+public class UserInfo {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInvite.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_invite")
-public class CaiUserInvite implements Serializable {
+public class UserInvite implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserMember.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_member")
-public class CaiUserMember implements Serializable {
+public class UserMember implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserOnline.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_online")
-public class CaiUserOnline implements Serializable {
+public class UserOnline implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserRiskLog.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_risk_log")
-public class CaiUserRiskLog implements Serializable {
+public class UserRiskLog implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserVisitor.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("cai_user_visitor")
-public class CaiUserVisitor implements Serializable {
+public class UserVisitor implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  */
 @Data
 @TableName("cai_withdraw_exchange")
-public class CaiWithdrawExchange implements Serializable {
+public class WithdrawExchange implements Serializable {
 
     private static final long serialVersionUID=1L;
 

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorAdminVo.java

@@ -1,10 +1,10 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiAnchor;
+import com.ruoyi.cai.domain.Anchor;
 import lombok.Data;
 
 @Data
-public class CaiAnchorAdminVo extends CaiAnchor {
+public class AnchorAdminVo extends Anchor {
     /**
      * 用户号/ID号
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorApplyAdminVo.java

@@ -1,12 +1,12 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiAnchorApply;
+import com.ruoyi.cai.domain.AnchorApply;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
-public class CaiAnchorApplyAdminVo extends CaiAnchorApply implements Serializable {
+public class AnchorApplyAdminVo extends AnchorApply implements Serializable {
     /**
      * 用户号/ID号
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/LowHeightRiskAdminVo.java

@@ -1,10 +1,10 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiLowHeightRisk;
+import com.ruoyi.cai.domain.LowHeightRisk;
 import lombok.Data;
 
 @Data
-public class CaiLowHeightRiskAdminVo extends CaiLowHeightRisk {
+public class LowHeightRiskAdminVo extends LowHeightRisk {
     /**
      * 用户号/ID号
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UnionAdminVo.java

@@ -1,6 +1,6 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiUnion;
+import com.ruoyi.cai.domain.Union;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CaiUnionAdminVo extends CaiUnion {
+public class UnionAdminVo extends Union {
 
     /**
      * 用户号/ID号

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserAdminVo.java

@@ -1,12 +1,12 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiUser;
+import com.ruoyi.cai.domain.User;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
-public class CaiUserAdminVo extends CaiUser {
+public class UserAdminVo extends User {
     /**
      * 最后登录IP
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserCountAdminVo.java

@@ -0,0 +1,30 @@
+package com.ruoyi.cai.dto.admin.vo;
+
+import com.ruoyi.cai.domain.UserCount;
+import lombok.Data;
+
+@Data
+public class UserCountAdminVo extends UserCount {
+    /**
+     * 用户号/ID号
+     */
+    private String usercode;
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+    /**
+     * 性别
+     */
+    private Integer gender;
+}

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserMemberAdminVo.java

@@ -1,12 +1,12 @@
 package com.ruoyi.cai.dto.admin.vo;
 
-import com.ruoyi.cai.domain.CaiUserMember;
+import com.ruoyi.cai.domain.UserMember;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CaiUserMemberAdminVo extends CaiUserMember {
+public class UserMemberAdminVo extends UserMember {
     /**
      * 用户号/ID号
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java

@@ -36,46 +36,46 @@ public class CurrentUserManager {
 
     public CurrentUserInfoVo currentInfo() {
         Long userId = LoginHelper.getUserId();
-        CaiUser user = userService.getById(userId);
+        User user = userService.getById(userId);
         CurrentUserInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserInfoVo::new);
-        CaiAnchor anchor = anchorService.getByUserId(userId);
+        Anchor anchor = anchorService.getByUserId(userId);
         res.setOpenVideoStatus(anchor.getOpenVideoStatus());
-        CaiUserCount userCount = userCountService.getByUserId(userId);
+        UserCount userCount = userCountService.getByUserId(userId);
         res.setUserCount(BeanConvertUtil.convertTo(userCount, UserCountVo::new));
-        CaiAccount account = accountService.getByUserId(userId);
+        Account account = accountService.getByUserId(userId);
         res.setUserAccount(BeanConvertUtil.convertTo(account, UserAccountVo::new));
-        List<CaiUserAlbum> userAlbums = userAlbumService.listByUserId(userId);
+        List<UserAlbum> userAlbums = userAlbumService.listByUserId(userId);
         res.setUserAlbumList(BeanConvertUtil.convertListTo(userAlbums, UserAlbumDTO::new));
         return res;
     }
 
     public UserAccountVo currentAccount(){
         Long userId = LoginHelper.getUserId();
-        CaiAccount account = accountService.getByUserId(userId);
+        Account account = accountService.getByUserId(userId);
         return BeanConvertUtil.convertTo(account,UserAccountVo::new);
     }
 
     public AnchorVo anchorInfo() {
         Long userId = LoginHelper.getUserId();
-        CaiAnchor anchor = anchorService.getByUserId(userId);
+        Anchor anchor = anchorService.getByUserId(userId);
         return BeanConvertUtil.convertTo(anchor,AnchorVo::new);
     }
 
     public boolean anchorUpdate(AnchorUpdateReq anchorUpdate) {
         anchorUpdate.setUserId(LoginHelper.getUserId());
         boolean updateFlag = false;
-        LambdaUpdateWrapper<CaiAnchor> update =
+        LambdaUpdateWrapper<Anchor> update =
-                Wrappers.lambdaUpdate(CaiAnchor.class).eq(CaiAnchor::getUserId, anchorUpdate.getUserId());
+                Wrappers.lambdaUpdate(Anchor.class).eq(Anchor::getUserId, anchorUpdate.getUserId());
         if(anchorUpdate.getPrice() != null){
-            update.set(CaiAnchor::getPrice,anchorUpdate.getPrice());
+            update.set(Anchor::getPrice,anchorUpdate.getPrice());
             updateFlag=true;
         }
         if(anchorUpdate.getOrderSwitch() != null){
-            update.set(CaiAnchor::getOrderSwitch,anchorUpdate.getOrderSwitch());
+            update.set(Anchor::getOrderSwitch,anchorUpdate.getOrderSwitch());
             updateFlag=true;
         }
         if(anchorUpdate.getOpenVideoStatus() != null){
-            update.set(CaiAnchor::getOpenVideoStatus,anchorUpdate.getOpenVideoStatus());
+            update.set(Anchor::getOpenVideoStatus,anchorUpdate.getOpenVideoStatus());
             updateFlag=true;
         }
         if(updateFlag){
@@ -87,23 +87,23 @@ public class CurrentUserManager {
     public boolean userUpdate(UserUpdateReq res) {
         res.setUserId(LoginHelper.getUserId());
         boolean updateFlag = false;
-        LambdaUpdateWrapper<CaiUser> update =
+        LambdaUpdateWrapper<User> update =
-                Wrappers.lambdaUpdate(CaiUser.class).eq(CaiUser::getId, res.getUserId());
+                Wrappers.lambdaUpdate(User.class).eq(User::getId, res.getUserId());
         if(StringUtils.isNotEmpty(res.getNickname())){
-            update.set(CaiUser::getNickname,res.getNickname());
+            update.set(User::getNickname,res.getNickname());
             updateFlag=true;
         }
         if(res.getBirthday() != null){
-            update.set(CaiUser::getBirthday,res.getBirthday());
+            update.set(User::getBirthday,res.getBirthday());
             updateFlag=true;
         }
         if(res.getCity() != null){
-            update.set(CaiUser::getCity,res.getCity());
+            update.set(User::getCity,res.getCity());
             updateFlag=true;
         }
         if(StringUtils.isNotEmpty(res.getAvatar())){
-            update.set(CaiUser::getAvatar,res.getAvatar());
+            update.set(User::getAvatar,res.getAvatar());
-            update.set(CaiUser::getAvatarState,1);
+            update.set(User::getAvatarState,1);
             updateFlag=true;
         }
         if(updateFlag){
@@ -115,14 +115,14 @@ public class CurrentUserManager {
         return true;
     }
 
-    public CaiAccountBankcard aliInfo() {
+    public AccountBankcard aliInfo() {
-        return accountBankcardService.getOne(Wrappers.lambdaQuery(CaiAccountBankcard.class)
+        return accountBankcardService.getOne(Wrappers.lambdaQuery(AccountBankcard.class)
-                .eq(CaiAccountBankcard::getUserId, LoginHelper.getUserId())
+                .eq(AccountBankcard::getUserId, LoginHelper.getUserId())
                 .last("limit 1"));
     }
 
     public void saveOrUpdateAliInfo(AccountAliBankCardRes res) {
-        CaiAccountBankcard bankcard = new CaiAccountBankcard();
+        AccountBankcard bankcard = new AccountBankcard();
         bankcard.setId(res.getId());
         if(bankcard.getId() == null){
             bankcard.setType(1);

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccountBankcard;
+import com.ruoyi.cai.domain.AccountBankcard;
 
 /**
  * 用户银行卡Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBankcard;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountBankcardMapper extends BaseMapper<CaiAccountBankcard> {
+public interface CaiAccountBankcardMapper extends BaseMapper<AccountBankcard> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccountBusiness;
+import com.ruoyi.cai.domain.AccountBusiness;
 
 /**
  * 账户业务Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountBusiness;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountBusinessMapper extends BaseMapper<CaiAccountBusiness> {
+public interface CaiAccountBusinessMapper extends BaseMapper<AccountBusiness> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccountCash;
+import com.ruoyi.cai.domain.AccountCash;
 
 /**
  * 用户提现记录Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountCash;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountCashMapper extends BaseMapper<CaiAccountCash> {
+public interface CaiAccountCashMapper extends BaseMapper<AccountCash> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccountDetail;
+import com.ruoyi.cai.domain.AccountDetail;
 
 /**
  * 账户明细Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountDetail;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountDetailMapper extends BaseMapper<CaiAccountDetail> {
+public interface CaiAccountDetailMapper extends BaseMapper<AccountDetail> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccount;
+import com.ruoyi.cai.domain.Account;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAccountMapper extends BaseMapper<CaiAccount> {
+public interface CaiAccountMapper extends BaseMapper<Account> {
 
     long decrCoin(@Param("userId") Long userId, @Param("coin") Long coin);
 

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiAccountRecharge;
+import com.ruoyi.cai.domain.AccountRecharge;
 
 /**
  * 充值记录Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiAccountRecharge;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountRechargeMapper extends BaseMapper<CaiAccountRecharge> {
+public interface CaiAccountRechargeMapper extends BaseMapper<AccountRecharge> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java

@@ -2,8 +2,8 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAnchorApply;
+import com.ruoyi.cai.domain.AnchorApply;
-import com.ruoyi.cai.dto.admin.vo.CaiAnchorApplyAdminVo;
+import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorApplyMapper extends BaseMapper<CaiAnchorApply> {
+public interface CaiAnchorApplyMapper extends BaseMapper<AnchorApply> {
 
-    Page<CaiAnchorApplyAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") CaiAnchorApplyAdminVo bo);
+    Page<AnchorApplyAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorApplyAdminVo bo);
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java

@@ -2,8 +2,8 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiAnchor;
+import com.ruoyi.cai.domain.Anchor;
-import com.ruoyi.cai.dto.admin.vo.CaiAnchorAdminVo;
+import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
 import com.ruoyi.cai.dto.app.query.AnchorListQuery;
 import com.ruoyi.cai.dto.app.vo.AnchorListVo;
 import org.apache.ibatis.annotations.Param;
@@ -14,9 +14,9 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorMapper extends BaseMapper<CaiAnchor> {
+public interface CaiAnchorMapper extends BaseMapper<Anchor> {
 
-    Page<CaiAnchorAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") CaiAnchorAdminVo bo);
+    Page<AnchorAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorAdminVo bo);
 
     Page<AnchorListVo> pageApp(@Param("build") Page<Object> build, @Param("query") AnchorListQuery query);
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiArea;
+import com.ruoyi.cai.domain.Area;
 
 /**
  * 地区Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiArea;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAreaMapper extends BaseMapper<CaiArea> {
+public interface CaiAreaMapper extends BaseMapper<Area> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiBanner;
+import com.ruoyi.cai.domain.Banner;
 
 /**
  * 轮播Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiBanner;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiBannerMapper extends BaseMapper<CaiBanner> {
+public interface CaiBannerMapper extends BaseMapper<Banner> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiCitys;
+import com.ruoyi.cai.domain.Citys;
 
 /**
  * 城市Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiCitys;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiCitysMapper extends BaseMapper<CaiCitys> {
+public interface CaiCitysMapper extends BaseMapper<Citys> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiDynamicImages;
+import com.ruoyi.cai.domain.DynamicImages;
 
 /**
  * 附件Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiDynamicImages;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicImagesMapper extends BaseMapper<CaiDynamicImages> {
+public interface CaiDynamicImagesMapper extends BaseMapper<DynamicImages> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.cai.domain.CaiDynamic;
+import com.ruoyi.cai.domain.Dynamic;
 import com.ruoyi.cai.dto.app.query.DynamicQuery;
 import com.ruoyi.cai.dto.app.vo.DynamicListVo;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicMapper extends BaseMapper<CaiDynamic> {
+public interface CaiDynamicMapper extends BaseMapper<Dynamic> {
 
     Page<DynamicListVo> pageApp(@Param("build") Page<Object> build, @Param("query") DynamicQuery query);
 

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiGift;
+import com.ruoyi.cai.domain.Gift;
 
 /**
  * 礼物Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGift;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiGiftMapper extends BaseMapper<CaiGift> {
+public interface CaiGiftMapper extends BaseMapper<Gift> {
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.cai.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.cai.domain.CaiGiveLog;
+import com.ruoyi.cai.domain.GiveLog;
 
 /**
  * 赠送记录Mapper接口
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiGiveLog;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiGiveLogMapper extends BaseMapper<CaiGiveLog> {
+public interface CaiGiveLogMapper extends BaseMapper<GiveLog> {
 
 }