Merge remote-tracking branch 'origin/master'

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

@@ -141,15 +141,10 @@ public class SettementUtil {
         List<Settlement> settlementList = new ArrayList<Settlement>();
         int lastDataRowNum =  importExcel.getLastDataRowNum();
         String key = "";//获取结算名称
-        String key1 = "";
         Integer count = 0; //计数器
         for (int i = 0; i < lastDataRowNum; i++) {
             settlement=new Settlement();
             key =  importExcel.getValue(i+1,1);
-            if(key.contains(RESON_KYJ)){
-                key1 = key;
-                key = RESON_KYJ;
-            }
             if (key.contains(BashInfo.JS_SJ)){
                 key=BashInfo.JS_SJ;
             }