解决合并3.1.5冲突

Forms/MainFrm.dfm

@@ -956,17 +956,16 @@ object MainForm: TMainForm
       Hint = #23450#20301
       Visible = ivAlways
     end
-<<<<<<< HEAD
     object dxbtnImportPlaneFxBillsToXmj: TdxBarButton
       Caption = #23548#20837#21488#36134'('#24179#38754#32467#26500')'#33267#39033#30446#33410
       Category = 0
       Hint = #23548#20837#21488#36134'('#24179#38754#32467#26500')'#33267#39033#30446#33410
-=======
+	  Visible = ivAlways
+    end	  
     object dxbtnSetDealPayPlan: TdxBarButton
       Caption = #35774#32622#35745#25552#26399#38480
       Category = 0
       Hint = #35774#32622#35745#25552#26399#38480
->>>>>>> 3.1.3.3
       Visible = ivAlways
     end
   end

Forms/MainFrm.pas

@@ -142,11 +142,8 @@ type
     dxbtnChangeDealBillsMode: TdxBarButton;
     dxsiExpandTo: TdxBarSubItem;
     dxbtnLocateBookmark: TdxBarButton;
-<<<<<<< HEAD
     dxbtnImportPlaneFxBillsToXmj: TdxBarButton;
-=======
     dxbtnSetDealPayPlan: TdxBarButton;
->>>>>>> 3.1.3.3
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure jtsProjectsChange(Sender: TObject; NewTab: Integer;

Units/DataBaseTables.pas

@@ -103,11 +103,7 @@ const
 
   {Çåµ¥Êý¾Ý -- ̨Õ˱༭½çÃæ}
   SBills = 'Bills';
-<<<<<<< HEAD
-  tdBills: array [0..80] of TScFieldDef =(
-=======
-  tdBills: array [0..78] of TScFieldDef =(
->>>>>>> 3.1.3.3
+  tdBills: array [0..82] of TScFieldDef =(
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     (FieldName: 'ParentID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'NextSiblingID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),

Units/ProjectData.pas

@@ -1529,14 +1529,14 @@ begin
   end;
 end;
 
-<<<<<<< HEAD
 function TProjectData.CheckDataBaseInfo(APhaseCount, AAuditStatus: Integer): Boolean;
 begin
   Result := (FProjProperties.PhaseCount = APhaseCount)
          and (FProjProperties.AuditStatus = AAuditStatus);
   if Result and (APhaseCount > 0) and (AAuditStatus <> -1) then
     Result := PhaseData.AuditCount = AAuditStatus;
-=======
+end;
+
 procedure TProjectData.OpenForReport3(const AFileName: string);
 begin
   FProjectID := -1;
@@ -1555,7 +1555,6 @@ begin
     FPhaseData.SimpleOpen2(Format('%sPhase%d.dat', [TempPath, FPhaseIndex]));
   end;
   FBillsMeasureData.ResetTreeNodeStageRec;
->>>>>>> 3.1.3.3
 end;
 
 end.