Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

 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;