Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss

lss

2020-06-10 b4912454b001d3287932463b9119dcdfb68e8ba4

 ZigbeeApp/Shared/Common/ResponseEntity/UserLoginRes.cs

@@ -15,8 +15,6 @@
        /// App在MQTT服务器上对称加密的Key
        /// </summary>
        public string MqttKey;
        public int UserType;
        public int MainUserID;
        //public string Password;
        /// <summary>
        /// 短信登录返回的md5后的密码