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

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

 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;