Merge branch 'release'

a0e9e33b · zhengyi · 36082180 · 08c1aeb4 · a0e9e33b
Commit a0e9e33b authored Dec 09, 2024 by zhengyi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

CustomerMergeServiceImpl.java ...r/controller/admin/customer/CustomerMergeServiceImpl.java +0 -1

No files found.
--- a/yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerMergeServiceImpl.java
+++ b/yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerMergeServiceImpl.java
@@ -214,7 +214,6 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
    private void doMergeTargetLog(CustomerDO customerDOSaved, CustomerDO customerDODeleted) {
        targetLogService.update(new LambdaUpdateWrapper<TargetLogDO>()
                .set(TargetLogDO::getCustomerId, customerDOSaved.getId())
-                .set(TargetLogDO::getCustomerType, customerDOSaved.getType())
                .eq(TargetLogDO::getCustomerId, customerDODeleted.getId()));
    }