Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/email/mapper/EmailTemplateMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.email.mapper;

import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.email.dto.EmailTemplateDTO;
import org.springblade.modules.email.entity.EmailTemplateEntity;
import org.springblade.modules.email.vo.EmailTemplateVO;
@@ -38,7 +39,7 @@
    * @param emailTemplate
    * @return
    */
   List<EmailTemplateVO> selectEmailTemplatePage(IPage page, EmailTemplateVO emailTemplate);
   List<EmailTemplateVO> selectEmailTemplatePage(IPage page, @Param("emailTemplate") EmailTemplateVO emailTemplate);


   /**