Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 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;

}