Commit 8d6a4d40a08a6f265a848d412ad53c3278578f39

Authored by wangjingyi
1 parent 8bc5254e

邮件模块 bug -修改保留字

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailAccountDO.java
1 package cn.iocoder.yudao.module.system.dal.dataobject.mail; 1 package cn.iocoder.yudao.module.system.dal.dataobject.mail;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
4 import com.baomidou.mybatisplus.annotation.TableName; 5 import com.baomidou.mybatisplus.annotation.TableName;
5 import lombok.Data; 6 import lombok.Data;
6 import lombok.EqualsAndHashCode; 7 import lombok.EqualsAndHashCode;
@@ -24,6 +25,7 @@ public class MailAccountDO extends BaseDO { @@ -24,6 +25,7 @@ public class MailAccountDO extends BaseDO {
24 /** 25 /**
25 * 邮箱 26 * 邮箱
26 */ 27 */
  28 + @TableField("`from`")
27 private String from; 29 private String from;
28 /** 30 /**
29 * 用户名 31 * 用户名
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/mail/MailAccountMapper.java
@@ -16,7 +16,7 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> { @@ -16,7 +16,7 @@ public interface MailAccountMapper extends BaseMapperX<MailAccountDO> {
16 16
17 default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) { 17 default PageResult<MailAccountDO> selectPage(MailAccountPageReqVO pageReqVO) {
18 return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>() 18 return selectPage(pageReqVO, new QueryWrapperX<MailAccountDO>()
19 - .likeIfPresent("form" , pageReqVO.getFrom()) 19 + .likeIfPresent("from" , pageReqVO.getFrom())
20 .likeIfPresent("host" , pageReqVO.getHost()) 20 .likeIfPresent("host" , pageReqVO.getHost())
21 .likeIfPresent("username" , pageReqVO.getUsername()) 21 .likeIfPresent("username" , pageReqVO.getUsername())
22 .eqIfPresent("password" , pageReqVO.getPassword()) 22 .eqIfPresent("password" , pageReqVO.getPassword())