Merge branch 'master' into NewFilePath

wei

2020-12-16 227bd88c1c8e41366c4bbffc54ee2b1fcbe35065

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -18,7 +18,7 @@
                UpdataFunctionList(sidObjects, oidJsonString);
            };

            new PublicAssmebly().TipMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);
            new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);

        }
        /// <summary>