Skip to content

J
jiedao-api-boot-master
Commit 139cfa31 authored by yanghao's avatar yanghao
Browse files
Options

Merge branch 'release-fix' into release

parents b8c7c4d8 0074f59a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @ 139cfa31
...@@ -389,7 +389,7 @@ public class CustomerController { ...@@ -389,7 +389,7 @@ public class CustomerController {
if (customerDODeleted.getCustomerService() == null) { if (customerDODeleted.getCustomerService() == null) {
throw exception(ErrorCodeConstants.CUSTOMER_DELETED_CUSTOMER_SERVICE_IS_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); throw exception(ErrorCodeConstants.CUSTOMER_MERGE_CUSTOMER_SERVICE_NOT_SAME);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment