From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
index 3ebf4eb..1ad2caf 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/OrganizationChartEntity.java
+++ b/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
 {
     /**
@@ -99,12 +99,32 @@
     private String contactNumber;
 
     /**
+     * areaList
+     */
+    @ApiModelProperty("areaList")
+    private String areaList;
+
+    /**
      * 机构等级
      */
     @ApiModelProperty("部门应用")
     private String departmentalApplication;
 
     /**
+     * 修改人
+     */
+    @ApiModelProperty("修改人")
+    private String updateUserId;
+
+    /**
+     * 修改人
+     */
+    @TableField(exist = false)
+    @ApiModelProperty("修改人姓名")
+    private String updateUserName;
+
+
+    /**
      * 下属机构
      */
     @TableField(exist = false)

--
Gitblit v1.7.1