合并客户时比较客户的客户经理属性值，当两个客户都不为公海池客户时才判断是否相等，否则抛出错误不能合并，公海池客户客户经理都时失效的，只保留主客户的过期客户经理

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java

@@ -387,7 +387,7 @@ public class CustomerController {
         if (customerDODeleted == null) {
             throw exception(ErrorCodeConstants.CUSTOMER_DELETED_NOT_EXISTS);
         }
-        if (!Objects.equals(customerDOSaved.getCustomerService(), customerDODeleted.getCustomerService())) {
+        if (!Objects.equals(customerDOSaved.getCustomerService(), customerDODeleted.getCustomerService()) && !customerDOSaved.getIsInOpenSea() &&  !customerDODeleted.getIsInOpenSea()) {
             throw exception(ErrorCodeConstants.CUSTOMER_MERGE_CUSTOMER_SERVICE_NOT_SAME);
         }