From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/resources/www.bendudu.com.pfx | 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 4 ++--
ruoyi-admin/src/main/resources/application.yml | 2 +-
3 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..a75dc70 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, "绁栧厛璁板綍鏁版嵁");
}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7ecbf40..5553b5b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@
key-store: classpath:www.bendudu.com.pfx
# 鈥�.pfx鈥濊瘉涔﹀搴旀牸寮忥紝鈥�.jks"璇佷功瀵瑰簲鈥淩SA鈥�
key-store-type: PKCS12
- key-store-password: 60ag68a7
+ key-store-password: 5yheh725
#key-password: 绉侀挜瀵嗙爜
servlet:
diff --git a/ruoyi-admin/src/main/resources/www.bendudu.com.pfx b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
index 5a7eb64..7cf9cd3 100644
--- a/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
+++ b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
Binary files differ
--
Gitblit v1.9.1