Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvity.vue

@@ -381,7 +381,7 @@ import beUpload from '../../components/tool/beUpload'
           this.endDialog=true;
         },
         ending(){   //完结提交
-          if(this.endTable.file=="")return this.$message.error("请上传完结报告");
+          if(this.endTable.file==""&&this.endTable.file==null)return this.$message.error("请上传完结报告");
           this.ajax.post(this.$store.state.api+"/UploadActivityFile",{
             uid:this.$store.state.userInfo.userid,
             aid:this.endTable.Id,