Merge remote-tracking branch 'origin/master'

3 years ago · 073fbdbafb
parent a1b735dc80 97cd700d3c
commit 073fbdbafb
1 changed files with 1 additions and 2 deletions
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
@ -230,8 +230,7 @@


    <insert id="importBasicUnitMaintain" keyProperty="id">
-        insert
-        ignore
+        replace
        INTO basic_corp
                ( thirdId, erpId, `name`, spell,
                 addr, status, `type`, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,