修复冲突

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java

@@ -71,7 +71,7 @@ public class ApiAppletHhrWorkInController extends BaseController {
 //        AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
         AppUsers localAppletUser = new AppUsers();
         localAppletUser.setUserId(dto.getAppUserId());
-        localAppletUser.setUserHh(1L);
+        localAppletUser.setUserHh(1);
         appUsersService.updateAppUsers(localAppletUser);
         return AjaxResult.success("申请成功合伙人");
     }
@@ -82,7 +82,7 @@ public class ApiAppletHhrWorkInController extends BaseController {
 //        AppUsers localAppletUser = AppletUtil.getLocalAppletUser();
         AppUsers localAppletUser = new AppUsers();
         localAppletUser.setUserId(dto.getAppUserId());
-        localAppletUser.setUserBcs(1L);
+        localAppletUser.setUserBcs(1);
         appUsersService.updateAppUsers(localAppletUser);
         return AjaxResult.success("申请成功伴宠师");
     }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java

@@ -1,4 +1,4 @@
-package com.ruoyi.model.model.entity;
+package com.ruoyi.model.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;