Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2

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

@@ -99,12 +99,32 @@
    private String contactNumber;

    /**
     * areaList
     */
    @ApiModelProperty("areaList")
    private String areaList;

    /**
     * 机构等级
     */
    @ApiModelProperty("部门应用")
    private String departmentalApplication;

    /**
     * 修改人
     */
    @ApiModelProperty("修改人")
    private Integer updateUserId;

    /**
     * 修改人
     */
    @TableField(exist = false)
    @ApiModelProperty("修改人姓名")
    private String updateUserName;


    /**
     * 下属机构
     */
    @TableField(exist = false)