From 44b319fd04ddcd6da211ce0b63fb6844004dad6d Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 26 五月 2022 11:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-CQY' into lss
---
HDL_ON/Entity/Function/Function.cs | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index ca8413a..b64d1e6 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -716,12 +716,8 @@
sendDataObj.time_stamp = Utlis.GetTimestamp();
var acd = new AlinkDoorlockStatus();
acd.sid = sid;
- acd.user_id = userId;
+ acd.user_id = extStr;
acd.ext_str = extStr;
-#if DEBUG
- acd.user_id = "013";
- acd.ext_str = "999999";
-#endif
sendDataObj.objects.Add(acd);
return sendDataObj;
}
--
Gitblit v1.8.0