合并冲突修改
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
parent
9d5aaf1e26
commit
a13807ae5f
|
@ -1006,14 +1006,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
isLoginUncommonly = true;
|
isLoginUncommonly = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 与上一次区域不一致
|
|
||||||
if (SplitAndConcatenate(existUserLoginInfo.LastLoginIP) != SplitAndConcatenate(iPRegion))
|
|
||||||
{
|
|
||||||
|
|
||||||
isLoginUncommonly = true;
|
|
||||||
|
|
||||||
|
|
||||||
if (loginUser != null)
|
if (loginUser != null)
|
||||||
{
|
{
|
||||||
//异地登录
|
//异地登录
|
||||||
|
|
Loading…
Reference in New Issue