Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

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

@@ -96,6 +96,8 @@
     */

    private String description;

    @Transient

    private Integer state;

    @Transient

    private AreaNames areaNames;

    @Transient

    private Organization organization;