Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-09 906e819de11a4f2a47545aff9fc551abd811adb5

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

@@ -101,4 +101,7 @@
    private AreaNames areaNames;

    @Transient

    private Organization organization;



    private Integer town_code;

    private Integer village_code;

}