From 79b75c02532e9826088a216130f6a1be8c15278d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 05 十一月 2024 21:30:01 +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/MarrySelfController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
index 940110d..f22f5ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
@@ -46,4 +46,4 @@
         ExcelUtil<MarryInfoDto> util = new ExcelUtil<>(MarryInfoDto.class);
         util.exportExcel(response, marryInfoDtos, "涓汉濠氬Щ鏁版嵁");
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1