Merge branch 'master' of D:\workspace\ztqt with conflicts.

lyfO_o

2022-04-07 cb2e79e8374725da81b19c518405f1b91c86e601

 src/views/contingencyplan/uploadFile.vue

@@ -73,7 +73,6 @@
  methods: {

      downLoadFile(fileUrl){
          console.log(123,fileUrl)
          let a = document.createElement('a')
          // a.href = this.defaultUrl+`/upload/downloadNew?path=`+encodeURI(fileUrl)
          a.href = process.env.BASE_API + '/upload/'+fileUrl