Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

 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;