Merge branch 'master' of http://192.168.1.41:3000/maixinrong/measure

Dprs/CSL/Measure_Cloud.cfg

@@ -31,7 +31,7 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"C:\Program Files (x86)\李뷘흡숭\셕좆連마 (데샙경+暾경) 1"
+-E"C:\Program Files (x86)\李뷘흡숭\李뷘써炬엄炬셕좆寧竟뺏흡숭(暾경)"
 -N"C:\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"

Dprs/CSL/Measure_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
+OutputDir=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
 UnitOutputDir=C:\DelphiTemp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=0
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2369
+Build=2246
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.7.2369
+FileVersion=3.1.7.2246
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -149,8 +149,9 @@ Count=2
 Item0=C:\DelphiTemp
 Item1=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=4
-Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
-Item1=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武
-Item2=D:\SmartCostExe\Measure\PWFree
-Item3=D:\SmartCostExe\Measure
+Count=5
+Item0=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
+Item1=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
+Item2=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)渭武
+Item3=D:\SmartCostExe\Measure\PWFree
+Item4=D:\SmartCostExe\Measure

Dprs/CSL/Measure_Cloud.dpr

@@ -248,7 +248,9 @@ uses
   AttachmentInfoDm in '..\..\DataModules\AttachmentInfoDm.pas' {AttachmentInfoData: TDataModule},
   DealPayFinalDm in '..\..\DataModules\DealPayFinalDm.pas' {DealPayFinalData: TDataModule},
   rmWuJiuZqzfGatherDm in '..\..\DataModules\ReportMemoryDm\rmWuJiuZqzfGatherDm.pas' {rmWuJiuZqzfGatherData: TDataModule},
-  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas';
+  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas',
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule};
 
 {$R *.res}