From 4fd3a2736011c69c8729f2b28902a5cd9d09fd2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/zy/crm/manager/controller/CompanyController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/CompanyController.java b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
index 0dd5fd2..363728d 100644
--- a/src/main/java/com/zy/crm/manager/controller/CompanyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CompanyController.java
@@ -9,9 +9,9 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.core.domain.KeyValueVo;
 import com.zy.crm.common.web.BaseController;
 import com.zy.crm.manager.entity.Company;
-import com.zy.crm.manager.entity.result.KeyValueVo;
 import com.zy.crm.manager.service.CompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

--
Gitblit v1.9.1