Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-12 493aa6cef3d036702558bde1a6994dff705e12c1

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -199,6 +199,10 @@
    @ApiModelProperty(name = "guideDepartmentName", value = "导办部门")
    private String guideDepartmentName;

    @TableField(exist = false)
    @ApiModelProperty(name = "areaName", value = "所属地区名字")
    private String areaName;

    @Override
    public String toString() {
        return "GuideRepairOrder{" +