merge

src/views/creditManage/projectCredit/dueReview/components/Company/index.vue

@@ -130,11 +130,7 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-<<<<<<< HEAD
-                  errorStr += item + ';'
-=======
                   errorStr += item + '!'
->>>>>>> c0a85812b27a32c25eee467a1bc0c5a8a33f7d9b
                 })
                 const msg = errorStr.substring(0, errorStr.length - 1)
                 this.$message.warning({ message: msg, duration: 3500 })