Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL_ON/Entity/Function/Function.cs

@@ -1465,7 +1465,6 @@
            spkList.Add(SensorDryContact2);
            spkList.Add(SenesorMegahealth);
            spkList.Add(SenesorMegahealth2);
            spkList.Add(SensorHelp);
            return spkList;
        }