Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 b7cce455b55ccffb60e53b101c82bbf478415fcf

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

@@ -17,7 +17,7 @@

@ApiModel("组织架构实体类")
@Data
@TableName("organization_chart")
@TableName("automessage_organization_chart")
public class OrganizationChartEntity  implements Serializable
{
    /**