Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

@@ -44,9 +44,8 @@
                    //sidObj.bus.LoopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
                    sidObj.bus.loopId = sidObj.sid.Substring(20, 4);
                }
                FunctionList.List.AddDeviceFunction(sidObj);
                //FunctionList.List.AddDeviceFunction(sidObj);
            }
            //MainPage.GoUserPage();
        }

    }