Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

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

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

    @Transient

    private Organization organization;



    private Long townCode;

    private Long villageCode;

}