Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-06-10 2103731f104c4b98ef596be50ff1dd972b4f6000

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -599,7 +599,7 @@
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
        })
        }).catch(() => {});
    },
#if($table.sub)
   /** ${subTable.functionName}序号 */
@@ -648,7 +648,7 @@
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        })
        }).catch(() => {});
    }
  }
};