Merge branch 'master' of http://192.168.1.41:3000/MaiXinRong/Measure

Units/ProjectData.pas

@@ -1309,13 +1309,13 @@ procedure TProjectData.ImportCloudTenderFile(const AFileName: string);
     sBillsSql = 'Insert Into Bills (ID, ParentID, NextSiblingID,' +
                 '    Code, B_Code, Name, Units, Alias, Price, NewPrice,' +
                 '    OrgQuantity, OrgTotalPrice, MisQuantity, MisTotalPrice, OthQuantity, OthTotalPrice,' +
-                '    CalcType,' +
+                '    CalcType, IsGatherZJJL,' +
                 '    DgnQuantity1, DgnQuantity2,'+
                 '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo, ApprovalCode)'+
                 '  Select ID, ParentID, NextSiblingID,'+
                 '    Code, B_Code, Name, Units, Alias, Price, NewPrice,' +
                 '    OrgQuantity, OrgTotalPrice, MisQuantity, MisTotalPrice, OthQuantity, OthTotalPrice,' +
-                '    CalcType,' +
+                '    CalcType, IsGatherZJJL,' +
                 '    DgnQuantity1, DgnQuantity2,'+
                 '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo, ApprovalCode'+
                 '  From Bills In ''%s''';