解决冲突

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -161,13 +161,6 @@ export default {
         InvoiceApplyState: 1,
         CustomerId: 0,
         IsDefaultInfo: 1,
-<<<<<<< HEAD
-=======
-        Address: '',
-        CompanyPhone: '',
-        OpeningBank: '',
-        BankNo: '',
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
       },
       DepartName: "",
       emName: "",
@@ -195,13 +188,6 @@ export default {
     Addiis: function () {   // 新增接口
       if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称！')
       if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号！')
-<<<<<<< HEAD
-=======
-      if (this.msg.Address === '') return this.$message.error('请填写地址！')
-      if (this.msg.CompanyPhone === '') return this.$message.error('请填写电话！')
-      if (this.msg.OpeningBank === '') return this.$message.error('请填写开户行！')
-      if (this.msg.BankNo === '') return this.$message.error('请填写账号！')
->>>>>>> 8e6bb64928beef82a7e4f060b1248eaebd93e197
       if (this.checked) {
         this.msg.IsDefaultInfo = 1
       } else {