Skip to content

T
Thick-Common
Commit 6d836e19 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复 合并的问题

parent 282fc80a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
Project.FLY.FlyADBase/FlyADBase/FlyADClientAdv.cs
View file @ 6d836e19
...@@ -421,9 +421,7 @@ namespace FlyADBase ...@@ -421,9 +421,7 @@ namespace FlyADBase
{ {
mTimeGridAdvHelper.AddDriveStatus_Default(Now, DriveOrder, DriveStatus, Marker); mTimeGridAdvHelper.AddDriveStatus_Default(Now, DriveOrder, DriveStatus, Marker);
} }
void advGetState() {
}
void advPushPos1() void advPushPos1()
{ {
mTimeGridAdvHelper.AddPos(Now, Position); mTimeGridAdvHelper.AddPos(Now, Position);
......
Project.FLY.Thick.Base/FLY.Thick.Base/IService/IInitParamService.cs
View file @ 6d836e19
...@@ -96,11 +96,6 @@ namespace FLY.Thick.Base.IService ...@@ -96,11 +96,6 @@ namespace FLY.Thick.Base.IService
/// </summary> /// </summary>
bool HasPunch { get; set; } bool HasPunch { get; set; }
/// <summary>
/// 有纵向光纤传感器
/// </summary>
bool HasVSign { get; set; }
/// <summary> /// <summary>
/// 打孔设备与探头中心偏移，单位mm /// 打孔设备与探头中心偏移，单位mm
/// </summary> /// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment