Merge remote-tracking branch 'origin/master'

沈斌

2017-10-27 a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424

 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;