From 068a2a5b8898ce2d4e59a4a9482d7236508cc35b Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 02 八月 2025 00:40:12 +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/ZfAncestorController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index a292d25..e9690ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -152,7 +152,7 @@
list = zfAncestorService.selectByCondition(zfAncestor);
// log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
/**
@@ -166,7 +166,7 @@
List<AncestorClan> list = zfAncestorService.selectByIds(ids);
// log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
@@ -279,7 +279,7 @@
return error("鏂板绁栧厛1'" + usa.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
- us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
+ usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
userService.insertUser(usa);
--
Gitblit v1.9.1