Merge remote-tracking branch 'origin/dev' into dev

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/CustomerServiceBiz.java

@@ -134,7 +134,7 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
 
         Example example = new Example(CustomerService.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("is_del",false);
+        criteria.andEqualTo("isDel",false);
 
       PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page,limit,()->mapper.selectByExample(example));
         List<CustomerService> data = pageDataVO.getData();
@@ -161,7 +161,7 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
     public CustomerServiceDTO findCustomerServiceById(Long id) {
          CustomerServiceDTO customerServiceDTO = new CustomerServiceDTO();
         CustomerService customerService = mapper.selectByPrimaryKey(id);
-        BeanUtils.copyProperties(customerService,customerService);
+        BeanUtils.copyProperties(customerService,customerServiceDTO);
         return customerServiceDTO;
     }
 }