From af27c7e07d7717d25ef06d4a4ae9e56ea184116a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

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

diff --git a/src/main/java/com/zy/crm/system/controller/UserController.java b/src/main/java/com/zy/crm/system/controller/UserController.java
index 8d29597..28f21dd 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -8,9 +8,9 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.core.domain.KeyValueVo;
 import com.core.exception.CoolException;
 import com.zy.crm.common.web.BaseController;
-import com.zy.crm.manager.entity.result.KeyValueVo;
 import com.zy.crm.manager.service.CstmrService;
 import com.zy.crm.system.entity.Role;
 import com.zy.crm.system.entity.User;

--
Gitblit v1.9.1