Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

 ruoyi-ui/src/views/system/oss/index.vue

@@ -188,7 +188,6 @@

<script>
import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
import { downLoadOss } from "@/utils/download";

export default {
  name: "Oss",
@@ -325,7 +324,7 @@
    },
    /** 下载按钮操作 */
    handleDownload(row) {
      downLoadOss(row.ossId)
      this.$download.oss(row.ossId)
    },
    /** 删除按钮操作 */
    handleDelete(row) {