Merge branch 'release-fix' into release

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

@@ -389,7 +389,7 @@ public class CustomerController {
         if (customerDODeleted.getCustomerService() == null) {
             throw exception(ErrorCodeConstants.CUSTOMER_DELETED_CUSTOMER_SERVICE_IS_NULL);
         }
-        if (customerDOSaved.getCustomerService() != customerDODeleted.getCustomerService()) {
+        if (!customerDOSaved.getCustomerService().equals(customerDODeleted.getCustomerService())) {
             throw exception(ErrorCodeConstants.CUSTOMER_MERGE_CUSTOMER_SERVICE_NOT_SAME);
         }