Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/DAL/Mqtt/MqttInfoConfig.cs

@@ -67,7 +67,8 @@
        public void Refresh()
        {
            m_Current = null;
            Save();
            Common.FileUtlis.Files.DeleteFile(ConfigFile);
            //Save();
        }

        public void Save()