From 47e227d27f5cfeca57befceff0939ea8309b4bc1 Mon Sep 17 00:00:00 2001
From: sikadi <13315935+sikadi_love@user.noreply.gitee.com>
Date: Thu, 23 Nov 2023 19:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fate/firm/domain/Firm.java            | 5 +++++
 .../main/java/com/fate/firm/domain/request/FirmRequest.java | 6 ++++++
 .../main/java/com/fate/firm/controller/FirmController.java  | 3 ---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java
index 0099af0..5cfccee 100644
--- a/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java
+++ b/fate-firm-common/src/main/java/com/fate/firm/domain/Firm.java
@@ -76,6 +76,10 @@ public class Firm extends BaseEntity {
     @TableField("firm_type")
     private Integer firmType;
 
+    @Excel(name = "负责人")
+    @TableField("firm_head")
+    private String firmHead;
+
     public static Firm addReqBuild(FirmRequest firmRequest){
         return Firm.builder()
                 .firmName(firmRequest.getFirmName())
@@ -89,6 +93,7 @@ public class Firm extends BaseEntity {
                 .updateTime(firmRequest.getUpdateTime())
                 .remark(firmRequest.getRemark())
                 .firmType(firmRequest.getFirmType())
+                .firmHead(firmRequest.getFirmHead())
                 .build();
     }
 }
diff --git a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
index 8383c5a..bf86532 100644
--- a/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
+++ b/fate-firm-common/src/main/java/com/fate/firm/domain/request/FirmRequest.java
@@ -68,4 +68,10 @@ public class FirmRequest {
     @Excel(name = "企业状态")
     @TableField("firm_type")
     private Integer firmType;
+
+    @Excel(name = "企业负责人")
+    @TableField("firm_head")
+    private String firmHead;
+
+
 }
diff --git a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
index 1ab5f30..6018821 100644
--- a/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
+++ b/fate-firm-server/src/main/java/com/fate/firm/controller/FirmController.java
@@ -1,12 +1,9 @@
 package com.fate.firm.controller;
 
-
-import com.alibaba.fastjson.JSON;
 import com.fate.common.datasource.annotation.Master;
 import com.fate.common.core.domain.Result;
 import com.fate.common.core.web.controller.BaseController;
 import com.fate.firm.domain.Firm;
-import com.fate.firm.domain.FirmType;
 import com.fate.firm.domain.request.FirmRequest;
 import com.fate.firm.service.FirmService;
 import lombok.extern.log4j.Log4j2;