Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ffdeae1a43e1539f9533f93d64089994db6c742b

 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()