Merge branch 'CJL-NEW'

wxr

2020-12-06 6b8177fe424b661687e9fb8119f990c05b054f2b

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -469,8 +469,9 @@
        /// <returns></returns>
        static string GetTimestamp()
        {
            DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
            return ((long)(DateTime.Now - startTime).TotalMilliseconds).ToString(); // 相差秒数
            //return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 相差秒数
        }

        /// <summary>