BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 8e480162c4991d6d9ab5cd27f6cd76559641fc23

Authored by YunaiV
2 parents 13e5d70b 18425496

Merge remote-tracking branch 'origin/feature/crm' into feature/crm 

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
Inline Side-by-side
Showing 1 changed file with 0 additions and 3 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
  View file @8e48016
1 package cn.iocoder.yudao.module.crm.controller.admin.customer; 1 package cn.iocoder.yudao.module.crm.controller.admin.customer;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;  
5 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -19,7 +18,6 @@ import io.swagger.v3.oas.annotations.Parameter; @@ -19,7 +18,6 @@ import io.swagger.v3.oas.annotations.Parameter;
19 import io.swagger.v3.oas.annotations.Parameters; 18 import io.swagger.v3.oas.annotations.Parameters;
20 import io.swagger.v3.oas.annotations.tags.Tag; 19 import io.swagger.v3.oas.annotations.tags.Tag;
21 import org.springframework.security.access.prepost.PreAuthorize; 20 import org.springframework.security.access.prepost.PreAuthorize;
22 -import org.springframework.util.CollectionUtils;  
23 import org.springframework.validation.annotation.Validated; 21 import org.springframework.validation.annotation.Validated;
24 import org.springframework.web.bind.annotation.*; 22 import org.springframework.web.bind.annotation.*;
25 23
@@ -32,7 +30,6 @@ import java.util.List; @@ -32,7 +30,6 @@ import java.util.List;
32 import java.util.Map; 30 import java.util.Map;
33 import java.util.Set; 31 import java.util.Set;
34 32
35 -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;  
36 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 33 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
37 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 34 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
38 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; 35 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;