Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 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;

}