Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-13 999d8a80d9a1c1f20033c29e7e2a08951766bee8

 src/main/java/com/moral/monitor/entity/MonitorPoint.java

File was renamed from src/main/java/com/moral/monitor/entity/Monitorpoint.java
@@ -2,7 +2,7 @@


import java.util.Date;



public class Monitorpoint {

public class MonitorPoint {

    private String id;



    private String name;