From f9c7928bff92596686e05a15fef21d499e954088 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 06 七月 2020 18:17:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

---
 src/Bro.Common.Model/Helper/EnumHelper.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/Bro.Common.Model/Helper/EnumHelper.cs b/src/Bro.Common.Model/Helper/EnumHelper.cs
index a055933..fdbb5b7 100644
--- a/src/Bro.Common.Model/Helper/EnumHelper.cs
+++ b/src/Bro.Common.Model/Helper/EnumHelper.cs
@@ -447,7 +447,7 @@
         /// <summary>
         /// 椹揪/杩愬姩鏉垮崱杩愯妯″紡
         /// </summary>
-        public enum MotorMoveMode
+        public enum MotionMode
         {
             /// <summary>
             /// 鏅�氱偣浣嶈繍鍔�
@@ -611,6 +611,7 @@
             Running,
             Alarm,
             Pause,
+            Resetting,
         }
     }
 }

--
Gitblit v1.8.0