Merge branch 'dev-tzy' into wxr6

wxr

2021-06-09 5bfb959c47017825c8cf7dc8570c55b04dab694c

 HDL_ON/DAL/Mqtt/MqttInfoConfig.cs

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

        public void Save()