Merge branch 'dev' into test

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

 package cn.iocoder.yudao.module.customer.controller.admin.customer;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.boot.module.order.api.OrderApi;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -341,7 +342,7 @@ public class CustomerMergeServiceImpl implements CustomerMergeService {
                 try {
                     // 1、联系人copy一份
                     CustomerContactsDO newCustomer = new CustomerContactsDO();
-                    BeanUtils.copyProperties(newCustomer, d);
+                    BeanUtil.copyProperties(d, newCustomer);
                     newCustomer.setId(null);
                     //被合并的客户联系人，默认为非默认
                     newCustomer.setIsDefault(0);

yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customerFollowup/CustomerFollowupController.http

 
 
+### 客户跟进
+GET {{baseUrl}}/customer/followup/getFollowupNewNumber
+Authorization: Bearer {{token}}
+tenant-id: {{adminTenentId}}
+Content-Type: application/json
+
 ### 客户跟进
 GET {{baseUrl}}/customer/followup/page?pageNo=1&pageSize=10&total=0&customerId=51966
 Authorization: Bearer {{token}}