合并总分包代码至master，并解决冲突

Forms/MainFrm.dfm

@@ -1140,14 +1140,12 @@ object MainForm: TMainForm
       Hint = #23450#20301#33267#21488#36134#20998#35299
       Visible = ivAlways
     end
-<<<<<<< HEAD
     object dxbtnGclGatherZJJL: TdxBarButton
       Caption = #35745#37327#27719#24635#26684#24335
       Category = 0
       Hint = #35745#37327#27719#24635#26684#24335
       Visible = ivAlways
     end
-=======
     object dxbtnExportSumBaseFile: TdxBarButton
       Action = actnExportSumBaseFile
       Category = 0
@@ -1189,7 +1187,6 @@ object MainForm: TMainForm
       Action = actnImportSubTenderGather
       Category = 0
     end
->>>>>>> sumUp
   end
   object Images: TImageList
     DrawingStyle = dsTransparent

Forms/MainFrm.pas

@@ -168,9 +168,7 @@ type
     dxbtnLocateZJJL: TdxBarButton;
     dxbtnEpure: TdxBarButton;
     dxbtnLocateCompileBills: TdxBarButton;
-<<<<<<< HEAD
     dxbtnGclGatherZJJL: TdxBarButton;
-=======
     dxbtnExportSumBaseFile: TdxBarButton;
     actnExportSumBaseFile: TAction;
     dxbtnGatherSubTender: TdxBarButton;
@@ -180,7 +178,6 @@ type
     dxbtnExportStgResult: TdxBarButton;
     dxbtnImportSubTenderGather: TdxBarButton;
     actnImportSubTenderGather: TAction;
->>>>>>> sumUp
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure jtsProjectsChange(Sender: TObject; NewTab: Integer;

Frames/BillsCompileFme.dfm

@@ -53,11 +53,7 @@ object BillsCompileFrame: TBillsCompileFrame
       Height = 376
       Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection, goShowTreeLine]
       OptionsEx = []
-<<<<<<< HEAD
       ColCount = 25
-=======
-      ColCount = 26
->>>>>>> sumUp
       RowCount = 7
       FixedRowCount = 3
       ShowGridLine = False

Units/ProjectData.pas

@@ -143,15 +143,11 @@ type
     {OpenForGather: BillsData, BillsMeasureTree, DealPaymentData, BGLData, PhaseData(根据PhaseIndex指定打开)}
     procedure OpenForGather(const AFileName: string; APhaseIndex: Integer = -1);
     {OpenForSignOnline: BillsData, BillsMeasureTree, PhaseData(根据PhaseIndex指定打开)}
-<<<<<<< HEAD
     procedure OpenForSignOnline(AProjRec: TsdDataRecord; APhaseIndex: Integer = -1);
-=======
-    procedure OpenForSignOnline(const AFileName: string; APhaseIndex: Integer = -1);
     {OpenForSumUpBase: BillsData, BillsComplieTree}
     procedure OpenForSumUpBase(const AFileName: string);
     {OpenForSumUpGather: BillsData, BillsMeasureTree, PhaseData(根据PhaseIndex指定打开)，直接调用OpenForSignOnline}
     procedure OpenForSumUpGather(const AFileName: string; APhaseIndex: Integer = -1);
->>>>>>> sumUp
     //-----------------------  End ---后台打开 ------------------------
 
     procedure SaveDebugFile(const AFileName: string);
@@ -274,14 +270,12 @@ type
 
 implementation
 
-uses UtilMethods, Globals, ProjectCommands, sdIDTree, StageDm,
+uses
+  UtilMethods, Globals, ProjectCommands, sdIDTree, StageDm,
   ZJJLDm, PHPWebDm, XMLDoc, XMLIntf, ConstUnit, PasswordInputFrm,
   mProgressProFrm, mDataRecord, ConditionalDefines, DbTreeImport,
-<<<<<<< HEAD
-  StrUtils, sdProvider, CalcDecimal, Math, CslJson, OrderCheckerFme;
-=======
-  StrUtils, sdProvider, CalcDecimal, Math, stgSubGatherFile;
->>>>>>> sumUp
+  StrUtils, sdProvider, CalcDecimal, Math, CslJson, OrderCheckerFme,
+  stgSubGatherFile;
 
 { TProjectData }
 
@@ -2202,7 +2196,6 @@ begin
   FIsGuest := Value;
 end;
 
-<<<<<<< HEAD
 procedure TProjectData.LoadCheckersData;
 var
   sURL: string;
@@ -2222,7 +2215,8 @@ begin
         Checkers.LastChecker := Checkers.Item[iIndex];
     end;
   end
-=======
+end;
+
 procedure TProjectData.OpenForSumUpBase(const AFileName: string);
 begin
   FProjectID := -1;
@@ -2238,7 +2232,7 @@ end;
 procedure TProjectData.OpenForSumUpGather(const AFileName: string;
   APhaseIndex: Integer);
 begin
-  OpenForSignOnline(AFileName, APhaseIndex);
+  OpenForGather(AFileName, APhaseIndex);
 end;
 
 procedure TProjectData.ImportSubTenderGather(const AFileName: string);
@@ -2254,7 +2248,6 @@ begin
     CalculateAll;
     vImportor.Free;
   end;
->>>>>>> sumUp
 end;
 
 end.