记得上下班打卡 | git大法好,push需谨慎

Commit d7fab81e authored by jiangxiulong's avatar jiangxiulong

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

parents a15e21e0 0cc4487d
...@@ -96,7 +96,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -96,7 +96,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
initUserMobileLocateObjs.add(new Object[]{ initUserMobileLocateObjs.add(new Object[]{
userInfoVo.getUid(), mobile, 1, userInfoVo.getUid(), mobile, 1,
mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4], mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
}); });
} }
...@@ -164,7 +164,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -164,7 +164,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
initUserMobileLocateObjs.add(new Object[]{ initUserMobileLocateObjs.add(new Object[]{
userInfoVo.getUid(), userInfoVo.getMobile(), 1, userInfoVo.getUid(), userInfoVo.getMobile(), 1,
mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4], mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now userInfoVo.getMobile(), cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment