From 338cb4fe7ce21f5cf4843b677503b8552ec5a80d Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 21:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fate/firm/domain/request/FirmRequest.java | 4 ++-- .../main/java/com/fate/firm/controller/FirmController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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> listAll() { - List list = firmService.listAll(); + List list = firmService.list(); return Result.success(list); }