fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.common.config;

import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@Data
@Component
@ConfigurationProperties(prefix = "mail")
public class MailProperties {

    private String smtpHost="gz-smtp.qcloudmail.com";

    private Integer smtpPort = 465;

    private String userAddr = "test@xzgtmail.591taxi.cn";

    private String password = "CY20250226pass";

    private String userName = "测试";

    /**
     * 账单提醒 ，同一个用户离上次发送短信的最小间隔
     * 单位分钟
     */
    private Integer billSmsDelayPeriod = 60;
    /**
     * 账单提醒 ，同一个用户离上次发送邮件的最小间隔
     * 单位分钟
     */
    private Integer billMailDelayPeriod = 60;
}