Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelGXJTask.java

@@ -167,7 +167,7 @@
                CokingTraceSuggestEntity suggestEntity = new CokingTraceSuggestEntity();
                suggestEntity.setRelId(tMap.get("relId").toString());
                suggestEntity.setProcess(tMap.get("process").toString());
                suggestEntity.setSugObj("GXJ");
                suggestEntity.setSugObj(i+"#");
                suggestEntity.setClock(tMap.get("clock").toString());
                suggestEntity.setContent(steamTotal);
                suggestEntity.setCreateDate(new Date());
@@ -191,7 +191,7 @@
                    deviationEntity.setRelId(tMap.get("relId").toString());
                    deviationEntity.setProcess(tMap.get("process").toString());
                    deviationEntity.setClock(tMap.get("clock").toString());
                    deviationEntity.setSugObj("GXJ");
                    deviationEntity.setSugObj("1#");
                    deviationEntity.setGroupName(steamFirstColoumMap.get("steamFirstColoum"+i).toString());
                    deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
                    deviationEntity.setIndValue(element.get(1).toString());
@@ -212,7 +212,7 @@
                    deviationEntity.setRelId(tMap.get("relId").toString());
                    deviationEntity.setProcess(tMap.get("process").toString());
                    deviationEntity.setClock(tMap.get("clock").toString());
                    deviationEntity.setSugObj("GXJ");
                    deviationEntity.setSugObj("2#");
                    deviationEntity.setGroupName(steamSecondColoumMap.get("steamSecondColoum" + i).toString());
                    deviationEntity.setIndName(steamIndexMaps.get(element.get(0).toString()));
                    deviationEntity.setIndValue(element.get(1).toString());