Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -273,6 +273,7 @@ public class UserLogic {
                     this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
                 }
             }
+            userWait.setId(workerNumber);
             userWait.setName(name);
             userWait.setIdcard(idcard);
             userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
@@ -281,7 +282,7 @@ public class UserLogic {
             userWait.setWorkerNumber(workerNumber);
             userWaits.add(userWait);
         }
-        userWaitService.saveBatch(userWaits);
+        userWaitService.saveOrUpdateBatch(userWaits);
     }