版本号：315.300，版本划分315的第一个版本

Dprs/Pro/Measure.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -131,24 +126,16 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.301
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-<<<<<<< HEAD
 [HistoryLists\hlConditionals]
 Count=1
 Item0=_mEncrypt;
@@ -161,5 +148,3 @@ Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
 Count=1
 Item0=D:\SmartCostExe\Measure
-=======
->>>>>>> remotes/origin/3.1.3.3

Dprs/Pro/Measure_Cloud.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.301
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_Cloud.dpr

@@ -144,12 +144,10 @@ uses
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
-  BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
@@ -177,8 +175,8 @@ uses
   tpSelectTenderDm in '..\..\TenderPartition\tpSelectTenderDm.pas' {tpSelectTenderData: TDataModule},
   tpSelectTenderNode in '..\..\TenderPartition\tpSelectTenderNode.pas',
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
-  tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm};
-  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
+  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.301
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.301
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong_TZ.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=202
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -129,24 +124,15 @@ DLL=0
 Locale=2052
 CodePage=936
 [Version Info Keys]
-<<<<<<< HEAD
-CompanyName=
-FileDescription=
-FileVersion=3.1.5.202
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
 CompanyName=珠海纵横创新软件有限公司
-FileDescription=纵横0号台账软件广东专业版
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+FileDescription=纵横0号台账广东专业版
+FileVersion=3.1.5.301
+InternalName=
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 Comments=
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_TZ.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=301
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.301
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算一体化软件
+ProductVersion=3.1.5.3
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.