Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

 src/main/java/com/moral/monitor/controller/Dashboard.java

@@ -357,7 +357,7 @@
        for (History a:historys){

            String format = sdf.format(a.getTime());

            xtime.add(format);

            yvalue.add(a.getMacValue());

            yvalue.add(a.getMac_value());

        }

        s.put("xtime",xtime);

        s.put("yvalue",yvalue);