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

lidongdong

2022-11-15 b892b3d8c2a536b6c2f5f9b9e67e195779037665

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

@@ -114,7 +114,7 @@
     * 修改人
     */
    @ApiModelProperty("修改人")
    private Long updateUserId;
    private String updateUserId;

    /**
     * 修改人