Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-09 dac3e12cc046aabeefd828b3f03794fe2bc0ba06

 src/Bro.M071.Process/M071Models.cs

@@ -137,13 +137,13 @@
            get => key;
            set
            {
                AlignName = key = value;
                AliasName = key = value;
            }
        }

        [Category("键名配置")]
        [Description("别名")]
        public string AlignName { get; set; }
        public string AliasName { get; set; }

        [Category("启用设置")]
        [Description("true：启用 false：禁用")]
@@ -178,7 +178,7 @@

        public string GetDisplayText()
        {
            return $"{AlignName}";
            return $"{AliasName}";
        }

        public List<string> GetHalconToolPathList()