Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -104,7 +104,4 @@


    private Long townCode;

    private Long villageCode;



    private Integer town_code;

    private Integer village_code;

}