Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

9 天以前 3d46f89ff6c600f60d97f4541443540be20460c1

 server/services/src/main/java/com/doumee/dao/business/model/Sites.java

@@ -105,6 +105,6 @@
    @TableField(exist = false)
    private String base64;
    @ApiModelProperty(value = "电子围栏经纬度集合 jsonb")
    @TableField(exist = false)
//    @TableField(exist = false)
    private String electronicFence;
}