diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
index 6f9577ff3..0256511f1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
@@ -5,13 +5,15 @@ package com.ruoyi.common.utils.uuid;
  * 
  * @author ruoyi
  */
-public class IdUtils {
+public class IdUtils
+{
     /**
      * 获取随机UUID
      * 
      * @return 随机UUID
      */
-    public static String randomUUID() {
+    public static String randomUUID()
+    {
         return UUID.randomUUID().toString();
     }
 
@@ -20,7 +22,8 @@ public class IdUtils {
      * 
      * @return 简化的UUID，去掉了横线
      */
-    public static String simpleUUID() {
+    public static String simpleUUID()
+    {
         return UUID.randomUUID().toString(true);
     }
 
@@ -29,7 +32,8 @@ public class IdUtils {
      * 
      * @return 随机UUID
      */
-    public static String fastUUID() {
+    public static String fastUUID()
+    {
         return UUID.fastUUID().toString();
     }
 
@@ -38,7 +42,8 @@ public class IdUtils {
      * 
      * @return 简化的UUID，去掉了横线
      */
-    public static String fastSimpleUUID() {
+    public static String fastSimpleUUID()
+    {
         return UUID.fastUUID().toString(true);
     }
 }
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index cbf3e649d..501f2f634 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -108,6 +108,7 @@
           plain
           icon="el-icon-download"
           size="mini"
+		  :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
@@ -354,6 +355,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 导出遮罩层
+      exportLoading: false,
       // 选中数组
       ids: [],
 #if($table.sub)
@@ -630,10 +633,12 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
           return export${BusinessName}(queryParams);
         }).then(response => {
           this.download(response.msg);
+          this.exportLoading = false;
         })
     }
   }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 9fca0c730..4776e5fe9 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -18,7 +18,8 @@ import com.ruoyi.quartz.util.CronUtils;
  * 
  * @author ruoyi
  */
-public class SysJob extends BaseEntity {
+public class SysJob extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
     /** 任务ID */
@@ -53,92 +54,118 @@ public class SysJob extends BaseEntity {
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
-    public Long getJobId() {
+    public Long getJobId()
+    {
         return jobId;
     }
 
-    public void setJobId(Long jobId) {
+    public void setJobId(Long jobId)
+    {
         this.jobId = jobId;
     }
 
     @NotBlank(message = "任务名称不能为空")
     @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
-    public String getJobName() {
+    public String getJobName()
+    {
         return jobName;
     }
 
-    public void setJobName(String jobName) {
+    public void setJobName(String jobName)
+    {
         this.jobName = jobName;
     }
 
-    public String getJobGroup() {
+    public String getJobGroup()
+    {
         return jobGroup;
     }
 
-    public void setJobGroup(String jobGroup) {
+    public void setJobGroup(String jobGroup)
+    {
         this.jobGroup = jobGroup;
     }
 
     @NotBlank(message = "调用目标字符串不能为空")
     @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
-    public String getInvokeTarget() {
+    public String getInvokeTarget()
+    {
         return invokeTarget;
     }
 
-    public void setInvokeTarget(String invokeTarget) {
+    public void setInvokeTarget(String invokeTarget)
+    {
         this.invokeTarget = invokeTarget;
     }
 
     @NotBlank(message = "Cron执行表达式不能为空")
     @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
-    public String getCronExpression() {
+    public String getCronExpression()
+    {
         return cronExpression;
     }
 
-    public void setCronExpression(String cronExpression) {
+    public void setCronExpression(String cronExpression)
+    {
         this.cronExpression = cronExpression;
     }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getNextValidTime() {
-        if (StringUtils.isNotEmpty(cronExpression)) {
+    public Date getNextValidTime()
+    {
+        if (StringUtils.isNotEmpty(cronExpression))
+        {
             return CronUtils.getNextExecution(cronExpression);
         }
         return null;
     }
 
-    public String getMisfirePolicy() {
+    public String getMisfirePolicy()
+    {
         return misfirePolicy;
     }
 
-    public void setMisfirePolicy(String misfirePolicy) {
+    public void setMisfirePolicy(String misfirePolicy)
+    {
         this.misfirePolicy = misfirePolicy;
     }
 
-    public String getConcurrent() {
+    public String getConcurrent()
+    {
         return concurrent;
     }
 
-    public void setConcurrent(String concurrent) {
+    public void setConcurrent(String concurrent)
+    {
         this.concurrent = concurrent;
     }
 
-    public String getStatus() {
+    public String getStatus()
+    {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(String status)
+    {
         this.status = status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("jobId", getJobId())
-                .append("jobName", getJobName()).append("jobGroup", getJobGroup())
-                .append("cronExpression", getCronExpression()).append("nextValidTime", getNextValidTime())
-                .append("misfirePolicy", getMisfirePolicy()).append("concurrent", getConcurrent())
-                .append("status", getStatus()).append("createBy", getCreateBy()).append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark())
-                .toString();
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("jobId", getJobId())
+            .append("jobName", getJobName())
+            .append("jobGroup", getJobGroup())
+            .append("cronExpression", getCronExpression())
+            .append("nextValidTime", getNextValidTime())
+            .append("misfirePolicy", getMisfirePolicy())
+            .append("concurrent", getConcurrent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
     }
 }