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

Frames/BillsGatherFme.pas

@@ -168,7 +168,7 @@ procedure TBillsGatherFrame.zgGclBillsCellGetColor(Sender: TObject;
       0: Result := QuantityRoundTo(fEndDealQuantity - fQuantity) > fCompare;
       1: Result := QuantityRoundTo(fEndDealQuantity - fDealQuantity) > fCompare;
       2: Result := (QuantityRoundTo(fEndDealQuantity - fQuantity) > fCompare)
-                or (QuantityRoundTo(fEndDealQuantity - fQuantity) > fCompare);
+                or (QuantityRoundTo(fEndDealQuantity - fDealQuantity) > fCompare);
     end;
   end;