Merge remote-tracking branch 'origin/jys7-15' into jys7-15

zj

2024-08-27 604341da0cfe8f40cdf549fe9ad145f0d443a718

 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>