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

wxr

2022-06-07 3afa6b622356b974a42ff29b1e4f0e35d2bf68f0

 HDL_ON/Entity/Function/Sensor.cs

@@ -161,7 +161,7 @@
                {
                    if (function.spk.Replace(".", "").Contains(attrKey.key.Replace(".", "")))
                    {
                        if (string.IsNullOrEmpty(attrKey.unit))
                        if (!string.IsNullOrEmpty(attrKey.unit))
                            return attrKey.unit;
                    }
                }