Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-06 3c3250c96a13c796aa88f1366b6d278cb95739e5

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

@@ -102,6 +102,6 @@
    @Transient

    private Organization organization;



    private Integer town_code;

    private Integer village_code;

    private Long townCode;

    private Long villageCode;

}