Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2021-01-21 bee4133c05f9c41f24ec7fa7449faabb79306087

 HDL_ON/Entity/Function/Function.cs

@@ -221,16 +221,12 @@
                        _trait_on_off.curValue = "off";
                    }
                }
                if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off")
                if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off" && _trait_on_off.curValue.ToString() != "stop")
                {
                    _trait_on_off.curValue = "off";
                }
                return _trait_on_off;
            }
            //set
            //{
            //    _trait_on_off = value;
            //}
        }

        /// <summary>