From 65a809eede3d90cf8cd5cadcdd1b4a5c1faba46d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 15 十一月 2022 11:33:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/CompanyController.java | 2 +-
src/main/java/com/zy/crm/system/controller/UserController.java | 2 +-
/dev/null | 22 ----------------------
src/main/java/com/zy/crm/manager/controller/CstmrController.java | 2 +-
pom.xml | 2 +-
5 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index a6c4f9e..46cb5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.4.0</cool.version>
+ <cool.version>3.6.0</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
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.*;
diff --git a/src/main/java/com/zy/crm/manager/controller/CstmrController.java b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
index a515484..09ed9c0 100644
--- a/src/main/java/com/zy/crm/manager/controller/CstmrController.java
+++ b/src/main/java/com/zy/crm/manager/controller/CstmrController.java
@@ -8,13 +8,13 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
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.controller.result.FollowerTableVo;
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.entity.CstmrFoll;
import com.zy.crm.manager.entity.CstmrType;
-import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.manager.service.CstmrFollService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.CstmrTypeService;
diff --git a/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java b/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
deleted file mode 100644
index fbb58f7..0000000
--- a/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zy.crm.manager.entity.result;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2021/4/13
- */
-@Data
-public class KeyValueVo {
-
- private String name;
-
- private Long value;
-
- public KeyValueVo() {
- }
-
- public KeyValueVo(String name, Long value) {
- this.name = name;
- this.value = value;
- }
-}
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