From c8762b3e0ba483d9205893b8f9eb5f244a653943 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 15 七月 2024 12:45:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java |    2 +-
 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfContactExcelBean.java        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
index 949ba2c..c998d5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
@@ -60,7 +60,7 @@
     /**
      * 妯℃澘
      */
-    @GetMapping("/model")
+    @PostMapping("/model")
     public void getModel(HttpServletResponse response){
         ZSelfNote zSelfNote = new ZSelfNote();
         List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote);
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfContactExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfContactExcelBean.java
index 75417aa..c7217f4 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfContactExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfContactExcelBean.java
@@ -18,7 +18,7 @@
     /**
      * 鎴愬憳濮撳悕
      */
-    @Excel(name = "鎴愬憳濮撳悕")
+    @Excel(name = "瀹朵汉濮撳悕")
     private String myName;
 
     /**

--
Gitblit v1.9.1