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 64baaa7..4a0a2f1 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
@@ -34,7 +34,7 @@ public class FirmRequest {
     @TableField("firm_phone")
     private String firmPhone;
 
-    @Excel(name = "企业类型")
+    @Excel(name = "企业权限")
     @TableField("firm_right")
     private Integer firmRight;
 
@@ -62,7 +62,7 @@ public class FirmRequest {
     @TableField("remark")
     private String remark;
 
-    @Excel(name = "(逻辑删)")
+    @Excel(name = "类型")
     @TableField("firm_type")
     private Integer firmType;
 
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 0d1e968..1a5a9f7 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
@@ -103,7 +103,7 @@ public class FirmController extends BaseController {
      **/
     @GetMapping("/listAll")
     public Result<List<Firm>> listAll() {
-        List<Firm> list = firmService.listAll();
+        List<Firm> list = firmService.list();
         return Result.success(list);
     }