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

wells.liu

2020-07-06 f9c7928bff92596686e05a15fef21d499e954088

 src/Bro.Common.Model/Helper/EnumHelper.cs

@@ -447,7 +447,7 @@
        /// <summary>
        /// 马达/运动板卡运行模式
        /// </summary>
        public enum MotorMoveMode
        public enum MotionMode
        {
            /// <summary>
            /// 普通点位运动
@@ -532,9 +532,9 @@

            [Description("指示灯-黄")]
            Light_Yellow = 1,
            [Description("指示灯-红")]
            Light_Green = 2,
            [Description("指示灯-绿")]
            Light_Green = 2,
            [Description("指示灯-红")]
            Light_Red = 3,
            [Description("蜂鸣器")]
            Beep = 4,
@@ -611,6 +611,7 @@
            Running,
            Alarm,
            Pause,
            Resetting,
        }
    }
}