修复 合并的问题

Project.FLY.FlyADBase/FlyADBase/FlyADClientAdv.cs

@@ -421,9 +421,7 @@ namespace FlyADBase
         {
             mTimeGridAdvHelper.AddDriveStatus_Default(Now, DriveOrder, DriveStatus, Marker);
         }
-        void advGetState() { 
 
-        }
         void advPushPos1()
         {
             mTimeGridAdvHelper.AddPos(Now, Position);

Project.FLY.Thick.Base/FLY.Thick.Base/IService/IInitParamService.cs

@@ -96,11 +96,6 @@ namespace FLY.Thick.Base.IService
         /// </summary>
         bool HasPunch { get; set; }
 
-        /// <summary>
-        /// 有纵向光纤传感器
-        /// </summary>
-        bool HasVSign { get; set; }
-
         /// <summary>
         /// 打孔设备与探头中心偏移，单位mm
         /// </summary>