From 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:55:50 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into Dev-Branch
---
HDL_ON/DAL/Server/NewApiRes.cs | 54 +++++++-----------------------------------------------
1 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 6bb1700..2d97f12 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -633,6 +633,11 @@
/// </summary>
public bool gatewayStatus;
+ /// <summary>
+ /// 鏄惁鏀寔缇ゆ帶
+ /// </summary>
+ public bool isSupportGroupControl = false;
+
///// <summary>
/////
///// </summary>
@@ -885,7 +890,7 @@
/// <summary>
/// 瀛愯处鍙稩D childAccountId
/// </summary>
- public string childAccountId;
+ public string childId;
/// <summary>
/// 浣忓畢
/// </summary>
@@ -908,7 +913,7 @@
/// <summary>
/// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
/// </summary>
- public string childAccountType;
+ //public string childAccountType;
///// <summary>
///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
///// </summary>
@@ -1246,51 +1251,6 @@
public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk",
public string remark;
}
-
- /// <summary>
- ///
- /// </summary>
- [System.Serializable]
- public class AppVersionRes
- {
- /// <summary>
- /// 搴旂敤甯傚満鍚嶇О
- /// </summary>
- public string appMarket;
- /// <summary>
- /// app鍚嶇О
- /// </summary>
- public string appName;
- /// <summary>
- /// ios涓嬭浇鍦板潃
- /// </summary>
- public string iosUrl;
- /// <summary>
- /// 瀹夊崜涓嬭浇鍦板潃
- /// </summary>
- public string androidUrl;
- /// <summary>
- /// 鏄惁鏄己鍒舵洿鏂�
- /// </summary>
- public bool isEnforce;
- /// <summary>
- /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid
- /// </summary>
- public string releaseSystem;
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string remark;
- /// <summary>
- /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
- /// </summary>
- public string updateDescription;
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public string version;
- }
-
/// <summary>
/// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
/// </summary>
--
Gitblit v1.8.0