Project.FLY.Thick.Base/FLY.Thick.Base/Server · 403ffa748e84e28e8dbfdf3230e653a4882b8f95 · 潘栩锋 / Thick-Common

Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316'… · 5f7f135c

潘栩锋 authored Mar 16, 2021

Merge remote-tracking branch 'remotes/gitlab/feature-feng-segmentLen-20200316' into feature-feng-updateMahApp-20201203

# Conflicts:
#	Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs

5f7f135c

Name	Last commit	Last update
..
AD2ThickHandler.cs		Loading commit data...
BoltMapImg.cs		Loading commit data...
BorderSearch.cs		Loading commit data...
BorderSearchPlastic.cs		Loading commit data...
CoatingSegmentSearch.cs		Loading commit data...
CurveCollection.cs		Loading commit data...
FilmPositionDetect.cs		Loading commit data...
FlyAdService.cs		Loading commit data...
GM_Base.cs		Loading commit data...
GM_Fix.cs		Loading commit data...
GM_GageInfo.cs		Loading commit data...
GM_ScanCorr.cs		Loading commit data...
GM_ScanMotion.cs		Loading commit data...
GetSample.cs		Loading commit data...
IGageMode.cs		Loading commit data...
InitParam.cs		Loading commit data...
Password.cs		Loading commit data...
Reject.cs		Loading commit data...
SysParam.cs		Loading commit data...
TempFilter.cs		Loading commit data...