From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/base/BaseApiController.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/base/BaseApiController.java b/src/main/java/com/ycl/jxkg/base/BaseApiController.java
index c9e1ab8..67e71ba 100644
--- a/src/main/java/com/ycl/jxkg/base/BaseApiController.java
+++ b/src/main/java/com/ycl/jxkg/base/BaseApiController.java
@@ -2,9 +2,7 @@
 
 
 import com.ycl.jxkg.context.WebContext;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.utility.ModelMapperSingle;
-import org.modelmapper.ModelMapper;
+import com.ycl.jxkg.domain.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -18,10 +16,7 @@
      * The constant DEFAULT_PAGE_SIZE.
      */
     protected final static String DEFAULT_PAGE_SIZE = "10";
-    /**
-     * The constant modelMapper.
-     */
-    protected final static ModelMapper modelMapper = ModelMapperSingle.Instance();
+
     /**
      * The Web context.
      */

--
Gitblit v1.8.0