From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/DAL/Server/NewApiRes.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 40d593d..955e396 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -585,7 +585,7 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId ="";
+ public string gatewayId = "";
/// <summary>
/// 缃戝叧snID
/// </summary>
@@ -885,7 +885,7 @@
/// <summary>
/// 瀛愯处鍙稩D childAccountId
/// </summary>
- public string childAccountId;
+ public string childId;
/// <summary>
/// 浣忓畢
/// </summary>
@@ -908,7 +908,7 @@
/// <summary>
/// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
/// </summary>
- public string childAccountType;
+ //public string childAccountType;
///// <summary>
///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
///// </summary>
@@ -994,7 +994,7 @@
}
-
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1219,7 +1219,7 @@
/// <summary>
///
/// </summary>
- public string version = MainPage.VersionString;
+ public string version = "V" + MainPage.VersionString;
///// <summary>
///// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
///// </summary>
@@ -1236,6 +1236,21 @@
///
/// </summary>
[System.Serializable]
+ public class AppVersionResNew
+ {
+ public string version;
+ public string appName;
+ public string appCode;
+ public bool isEnforce;
+ public string releaseSystem;
+ 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>
--
Gitblit v1.8.0