Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/util/BashInfo.java

@@ -724,7 +724,7 @@ public class BashInfo {
             if(type.equals("")){
                 continue;
             }
-            if (!type.contains("投标") && !type.contains("结算") && !type.contains("合计") && !type.contains("发包人") && !type.contains("竣工") && !type.contains("招标人") && !type.contains("税金")&& !type.contains("税额") && !type.contains("工程造价")) {
+            if (!type.contains("投标")  && !type.contains("结算") && !type.contains("合计") && !type.contains("发包人") && !type.contains("竣工") && !type.contains("招标人") && !type.contains("税金")&& !type.contains("税额") && !type.contains("工程造价")&& !type.contains("下浮后造价") || type.contains("投标下浮")) {
                  jkxlAdjustFee = new JkxlAdjustFee();
                  double fee = Math.abs(importExcel.getDouble(j+1,2));
                  jkxlAdjustFee.setType(type);