Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs

@@ -892,9 +892,9 @@
        /// 信息提示窗口，自动关闭
        /// </summary>
        /// <param name="msg">提示错误文本</param>
        public void FlashingBox(string msg)
        public void FlashingBox(string msg,int time=2000)
        {
            new PublicAssmebly().TipMsgAutoClose(msg, false, 2000);
            new PublicAssmebly().TipMsgAutoClose(msg, false, time);
        }

        /// <summary>