Merge branch 'Dev-Branch' into wjc

wxr

2022-11-11 b47f91b91bc5371bba0c8801dbd648772ab331fc

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -585,7 +585,7 @@
        /// <summary>
        /// 网关ID
        /// </summary>
        public string gatewayId ="";
        public string gatewayId = "";
        /// <summary>
        /// 网关snID
        /// </summary>
@@ -994,7 +994,7 @@

    }

    

    #endregion

    #region 数据分享
@@ -1220,10 +1220,31 @@
        /// 
        /// </summary>
        public string version = MainPage.VersionString;
        ///// <summary>
        ///// 软件来源，Evoyo、ON、ON_Plus
        ///// </summary>
        //public string appName = SoftwareType.ON_Plus.ToString();

        public string appCode = "1588071238036582401";
        /// <summary>
        /// 软件来源，Evoyo、ON、ON_Plus
        /// IOS、Android
        /// </summary>
        public string appName = SoftwareType.ON_Plus.ToString();
        public string releaseSystem = "";
    }

    /// <summary>
    /// 
    /// </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>