Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7

 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>