Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 d0a7ad5e3a1c147a70a0e792c3eafa3b7613fff7

 src/main/java/com/moral/monitor/service/MgrService.java

@@ -19,8 +19,8 @@
        return  mgrDao.randpoint();

    }



    public List<Equipment> pointequ(String monitorpoint){

        return mgrDao.pointequ(monitorpoint);

    public List<Equipment> pointequ(String Monitorpoint){

        return mgrDao.pointequ(Monitorpoint);

    }



    public List<State> equsensorstate(String mac){return mgrDao.equsensorstate(mac);}