Merge remote-tracking branch 'origin/master'

沈斌

2017-10-30 faec027b63bb19d061098724754895ae801ad493

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

@@ -275,7 +275,7 @@
            ae.setDevice_name(e.getName());

            ae.setMac(e.getMac());

            ae.setStatus(e.getState());

            ae.setFei(e.getFei());

//            ae.setFei(e.get);

           // ae.setCreate_time(DateConvert.dateConvert(e.getTime()));

            apiEquipments.add(ae);



@@ -330,7 +330,7 @@
            ae.setDevice_name(e.getName());

            ae.setMac(e.getMac());

            ae.setStatus(e.getState());

            ae.setFei(e.getFei());

//            ae.setFei(e.getFei());

            ae.setCreate_time(DateConvert.dateConvert(e.getTime()));

            apiEquipments.add(ae);