From b4912454b001d3287932463b9119dcdfb68e8ba4 Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期三, 10 六月 2020 15:54:02 +0800
Subject: [PATCH] Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss
---
ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
index 631c349..81625cc 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
@@ -13,6 +13,7 @@
{
}
+<<<<<<< HEAD
public string StateCode { get; set; }
public string ErrorInfo { get; set; }
public Info ResponseData { get; set; }
@@ -24,10 +25,24 @@
public int RowCount { get; set; }
public int PageTotal { get; set; }
public List<SoundInfo> Data { get; set; }
+=======
+ public string StateCode = "";
+ public string ErrorInfo = "";
+ public Info ResponseData = new Info();
+
+ public class Info
+ {
+ public int PageSize = 0;
+ public int PageIndex = 0;
+ public int RowCount = 0;
+ public int PageTotal = 0;
+ public List<SoundInfo> Data = new List<SoundInfo>();
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
}
public class SoundInfo
{
+<<<<<<< HEAD
public string UserID { get; set; }
public string AuthCode { get; set; }
public string Token { get; set; }
@@ -49,13 +64,43 @@
/// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛�
/// </summary>
public string UserName { get; set; } = "123456@qq.com";
+=======
+
+ public string UserID = "";
+ public string AuthCode = "";
+ public string Token = "";
+ public string RefreshToken = "";
+ /// <summary>
+ /// Baidu
+ /// </summary>
+ public string Platform = "Baidu";
+ public string HomeID = "";
+ public string OpenUID = "";
+ /// <summary>
+ /// 鏅鸿兘闊崇澶囨敞
+ /// </summary>
+ public string Remark = "";
+ public string Id = "";
+ public bool IsDeleted = false;
+ public string CreatedOnUtc = "";
+ /// <summary>
+ /// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛�
+ /// </summary>
+ public string UserName;
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
}
public class Auth
{
+<<<<<<< HEAD
public string Platform { get; set; }
public string UserID { get; set; }
public string HomeID { get; set; }
+=======
+ public string Platform = "";
+ public string UserID = "";
+ public string HomeID = "";
+>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188
public PageSetting PageSetting { get; set; }
public Auth()
--
Gitblit v1.8.0