From a8e2e9ff1040e8668e992b97416eaad21132dae1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Dec 2024 22:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jys7-15' into jys7-15

---
 src/main/resources/spring/applicationContext-email.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/spring/applicationContext-email.xml b/src/main/resources/spring/applicationContext-email.xml
index f2fb88d..6a14205 100644
--- a/src/main/resources/spring/applicationContext-email.xml
+++ b/src/main/resources/spring/applicationContext-email.xml
@@ -38,7 +38,7 @@
 	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
 		<property name="host" value="${email.host}" />
 		<!-- mail account -->
-		<property name="username" value="${email.username}" />
+		<property name="username" value="${	email.username}" />
 		<property name="password" value="${email.password}" />
 		<property name="javaMailProperties">
 			<props>

--
Gitblit v1.9.3