Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

 src/main/java/com/moral/monitor/dao/MgrDao.java

@@ -12,12 +12,12 @@
@Repository

public interface MgrDao {



    public List<Monitorpoint> randpoint();

    public List<MonitorPoint> randpoint();

    public List<Equipment> pointequ(String monitorpoint);



    public List<State> equsensorstate(@Param("mac") String mac);



    public List<Monitorpoint> allpoint();

    public List<MonitorPoint> allpoint();



    public List<PointAvg>  allPointsData(QueryHelper queryHelper);

    public int  pointcount(QueryHelper queryHelper);