diff --git a/ruoyi-ui/src/views/business/log/maillog/index.vue b/ruoyi-ui/src/views/business/log/maillog/index.vue
index 44b3b65e..4f6dd578 100644
--- a/ruoyi-ui/src/views/business/log/maillog/index.vue
+++ b/ruoyi-ui/src/views/business/log/maillog/index.vue
@@ -257,6 +257,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangeCreateTime = [];
+      this.queryParams.createTime = null
+      this.queryParams.endCreateTime = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/domain/mall/MailBean.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/domain/mall/MailBean.java
index 708c53d2..e3c6dd64 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/domain/mall/MailBean.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/domain/mall/MailBean.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 邮箱发送实体
@@ -34,6 +35,11 @@ public class MailBean implements Serializable {
      */
     private String userName;
 
+    /**
+     * 抄送人
+     */
+    private List<String> cc;
+
     /**
      * 附件地址
      */
diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/MailServer.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/MailServer.java
index 6058d4fb..597b6d0f 100644
--- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/MailServer.java
+++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/server/MailServer.java
@@ -1,5 +1,6 @@
 package com.xjs.server;
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.redis.service.RedisService;
 import com.xjs.annotation.MailLog;
 import com.xjs.domain.mall.MailBean;
@@ -120,8 +121,13 @@ public class MailServer {
             mimeMessageHelper.setFrom(MAIL_SENDER);
             mimeMessageHelper.setTo(mailBean.getRecipient());
             mimeMessageHelper.setSubject(mailBean.getSubject());
+
             //邮件抄送
-            //mimeMessageHelper.addCc("抄送人");
+            if (CollUtil.isNotEmpty(mailBean.getCc())) {
+                for (String c : mailBean.getCc()) {
+                    mimeMessageHelper.addCc(c);
+                }
+            }
             mimeMessageHelper.setText(mailBean.getContent(), true);
             javaMailSender.send(mimeMailMessage);
         } catch (Exception e) {
@@ -147,19 +153,20 @@ public class MailServer {
             mimeMessageHelper.setSubject(mailBean.getSubject());
             mimeMessageHelper.setText(mailBean.getContent(), true);
 
+            //邮件抄送
+            if (CollUtil.isNotEmpty(mailBean.getCc())) {
+                for (String c : mailBean.getCc()) {
+                    mimeMessageHelper.addCc(c);
+                }
+            }
+
             //发送附件
             if (mailBean.getFileList() != null && mailBean.getFileList().length > 0) {
                 for (MultipartFile multipartFile : mailBean.getFileList()) {
-                    InputStream inputStream = null;
-                    try {
-                        inputStream = multipartFile.getInputStream();
+                    try (InputStream inputStream = multipartFile.getInputStream()) {
                         byte[] bytes = inputStream.readAllBytes();
                         ByteArrayResource bar = new ByteArrayResource(bytes);
                         mimeMessageHelper.addAttachment(Objects.requireNonNull(multipartFile.getOriginalFilename()), bar);
-                    } finally {
-                        if (inputStream != null) {
-                            inputStream.close();
-                        }
                     }
                 }
             }