Refresh.

Dprs/CSL/Measure_Cloud.cfg

@@ -32,7 +32,7 @@
 -$M16384,1048576
 -K$00400000
 -E"C:\Program Files (x86)\李뷘흡숭\셕좆連마 (데샙경+暾경) 1"
--N"E:\DelphiTemp"
+-N"D:\Work\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mEncrypt;_Test

Dprs/CSL/Measure_Cloud.dof

@@ -91,7 +91,7 @@ ImageBase=4194304
 ExeDescription=
 [Directories]
 OutputDir=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
-UnitOutputDir=E:\DelphiTemp
+UnitOutputDir=D:\Work\DelphiTemp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=1077
-=======
-Build=1068
->>>>>>> 3.1.5
+Build=1071
 Debug=0
 PreRelease=0
 Special=0
@@ -130,15 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-<<<<<<< HEAD
-FileVersion=3.1.3.1077
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
+FileVersion=3.1.3.1071
+InternalName=
+LegalCopyright=
+LegalTrademarks=
 OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
+ProductName=
+ProductVersion=1.0.0.0
 [HistoryLists\hlConditionals]
 Count=1
 Item0=_mCloud;_mEncrypt;_Test
@@ -146,19 +140,8 @@ Item0=_mCloud;_mEncrypt;_Test
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=E:\DelphiTemp
-Item1=D:\Dcu
-[HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
-Item1=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
-[HistoryLists\hlBPLOutput]
 Count=1
-Item0=..\Bin
-[HistoryLists\hlDCPOutput]
+Item0=D:\Work\DelphiTemp
+[HistoryLists\hlOutputDirectorry]
 Count=1
-Item0=D:\Dcu
-=======
-FileVersion=3.1.3.1068
->>>>>>> 3.1.5
+Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1

Dprs/CSL/Measure_Cloud.dpr

@@ -154,18 +154,11 @@ uses
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-<<<<<<< HEAD
-=======
   tpMainFrm in '..\..\TenderPartition\tpMainFrm.pas' {tpMainForm},
->>>>>>> 3.1.5
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
   tpGatherTree in '..\..\TenderPartition\tpGatherTree.pas',
   tpMainData in '..\..\TenderPartition\tpMainData.pas',
-<<<<<<< HEAD
-  tpMainFrm in '..\..\TenderPartition\tpMainFrm.pas' {tpMainForm},
-=======
->>>>>>> 3.1.5
   tpNoPegDm in '..\..\TenderPartition\tpNoPegDm.pas' {tpNoPegData: TDataModule},
   tpPartTender in '..\..\TenderPartition\tpPartTender.pas',
   tpPartTenderFme in '..\..\TenderPartition\tpPartTenderFme.pas' {tpPartTenderFrame: TFrame},
@@ -183,7 +176,12 @@ uses
   tpSelectTenderNode in '..\..\TenderPartition\tpSelectTenderNode.pas',
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
-  mPegFilter in '..\..\Units\mPegFilter.pas';
+  mPegFilter in '..\..\Units\mPegFilter.pas',
+  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas',
+  ClientService in '..\..\Encrypt\NetClient\ClientService.pas',
+  CfgPort in '..\..\Encrypt\NetClient\CfgPort.pas',
+  CorrespondClient in '..\..\Encrypt\NetClient\CorrespondClient.pas',
+  EnctyptClientData in '..\..\Encrypt\NetClient\EnctyptClientData.pas';
 
 {$R *.res}