Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents f7832f35 7d60e087
Showing 1 changed file with 1 additions and 1 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomerImportBizService.java
@@ -174,7 +174,7 @@ public class CustomerImportBizService {
         customer.setShopId(customerImport.getShopId());
         customer.setAdviserId(customerImport.getAdviserId());
         customer.setYn(Boolean.TRUE);
-        customerService.updateById(customer);
+        customerService.saveOrUpdate(customer);
         customerImport.setMark(1);
         customerImport.setOldId(customer.getId());
     }