From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/Entity/DB_ResidenceData.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 87de6b6..ff40908 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -11,7 +11,10 @@
public DB_ResidenceData()
{
}
-
+ /// <summary>
+ /// 涓讳汉token
+ /// </summary>
+ public string MasterToken;
/// <summary>
/// 0:bus缃戝叧
/// 1:A鍗忚缃戝叧
@@ -30,11 +33,11 @@
}
else
{
- var curRegion = UserInfo.Current.regionList.Find((obj) => obj.RegionID == CurReginID);
+ var curRegion = MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID);
//if (curRegion == null)
//{
- // CurReginID = UserInfo.Current.regionList[0].RegionID;
- // return UserInfo.Current.regionList[0];
+ // CurReginID = MainPage.LoginUser.regionList[0].RegionID;
+ // return MainPage.LoginUser.regionList[0];
//}
return curRegion;
}
--
Gitblit v1.8.0