Merge remote-tracking branch 'origin/master'

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

@@ -72,7 +72,7 @@
    }};

    private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
        put("BMSY001", "备煤耗电");
        put("F0000101008", "备煤耗电");
    }};

    private static final String jsonStr="{\n" +

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

@@ -72,10 +72,10 @@
    }};

    private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
        put("HCSY001", "蒸汽消耗");
        put("HCSY020", "初冷器出口煤气温度");
        put("HCSY021", "洗苯塔后煤气含苯");
        put("HCSY022", "脱硫后H2S含量");
        put("F0000101006", "蒸汽消耗");
        put("F0000101006", "初冷器出口煤气温度");
        put("F0000101006", "洗苯塔后煤气含苯");
        put("F0000101006", "脱硫后H2S含量");
    }};

    private static final String jsonStr="{\n" +

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

@@ -75,8 +75,8 @@
    }};

    private static final HashMap<String, Object> historyPointMap = new HashMap<String, Object>() {{
        put("LJSY001", "荒煤气发生");
        put("LJSY005", "耗热量");
        put("F0000101009", "荒煤气发生");
        put("F0000101009", "耗热量");
    }};

    private static final String jsonStr="{\n" +