Merge remote-tracking branch 'origin/master'

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

@@ -19,7 +19,7 @@ public class SettementUtil {
     public static final String BDZ_TBRNAME="投标人采购设备费";
     public static final String BDZ_ZBRNAME="招标人采购材料费";
     public static final String BDZ_TBNAME="投标报价";
-    public static final String SJ = "税";
+    public static final String SE= "税额";
 
     /*
         分布分项比对
@@ -144,7 +144,10 @@ public class SettementUtil {
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
-            if(key.contains(SJ)){
+            if (key.contains(BashInfo.JS_SJ)){
+                key=BashInfo.JS_SJ;
+            }
+            if(key.contains(SE)){
                 key=BashInfo.JS_SJ;
             }
             if(key.equals(BDZ_TBRNAME)){