From 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 18:03:18 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath

---
 HDL_ON/DAL/Server/NewApiRes.cs |   83 ++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 8b7a67a..5ba1bf8 100755
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -878,56 +878,6 @@
         public string homeId;
     }
 
-
-
-    //鑾峰彇椤圭洰 (浣忓畢)涓嬮潰鐨勫瓙璐﹀彿
-    /// <summary>
-    /// 鑾峰彇鎴愬憳淇℃伅鐨勭粨鏋�
-    /// </summary>
-    ///  [Serializable]
-    public class SubAccountNewRes
-    {
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string id;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string homeId;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string homeRegionId;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string childAccountId;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string childAccountRegionId;
-        /// <summary>
-        /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
-        /// </summary>
-        public string childAccountType;
-        /// <summary>
-        /// 鏄惁鍏佽杩滅▼鎺у埗
-        /// </summary>
-        public bool isRemoteControl;
-        /// <summary>
-        /// 鏄电О1
-        /// </summary>
-        public string nickName;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string createTime;
-
-
-    }
-
     /// <summary>
     /// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
     /// </summary>
@@ -1446,9 +1396,42 @@
         /// 鎺ㄩ�侀檮鍔犳暟鎹�
         /// </summary>
         public string Extras;
+        /// <summary>
+        /// 淇℃伅绫诲瀷
+        /// </summary>
+        public string messageType = "";
 
     }
 
+    /// <summary>
+    /// 鏋佸厜鎺ㄩ�佹秷鎭�
+    /// </summary>
+    [System.Serializable]
+    public class JPushExpandData
+    {
+        /// <summary>
+        /// 闄勫姞鍐呭
+        /// </summary>
+        public string expandData;
+       
+    }
+
+    /// <summary>
+    /// 鏋佸厜鎺ㄩ�佹秷鎭�
+    /// </summary>
+    [System.Serializable]
+    public class ExpandData
+    {
+        /// <summary>
+        /// 闄勫姞鍐呭
+        /// </summary>
+        public string expantContent;
+        /// <summary>
+        ///  淇℃伅绫诲瀷
+        /// </summary>
+        public string messageType;
+    }
+
     //#region 鏃ф帴鍙�
     ///// <summary>
     ///// 

--
Gitblit v1.8.0