修复bug

src/views/dataPermission/index.vue

@@ -469,12 +469,6 @@ export default {
             })
           } else {
             this.ruleForm.tenant=this.userinfo.tenantId
-<<<<<<< HEAD
-            // console.log(this.ruleForm)
-=======
-           
-           
->>>>>>> dev
             this.$api.addData(this.ruleForm).then(response => {
               this.$message.success('新增成功')
               this.btnLoading = false