From 83953fac1e778b6de84efaa09bc6913fed2e0b12 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 16:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java b/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java
index 4a402d8..12e0871 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/BaseWXApiController.java
@@ -1,14 +1,12 @@
package com.ycl.jxkg.controller.wx;
import com.ycl.jxkg.context.WxContext;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.domain.UserToken;
-import com.ycl.jxkg.utility.ModelMapperSingle;
-import org.modelmapper.ModelMapper;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.entity.UserToken;
import org.springframework.beans.factory.annotation.Autowired;
public class BaseWXApiController {
- protected final static ModelMapper modelMapper = ModelMapperSingle.Instance();
+
@Autowired
private WxContext wxContext;
--
Gitblit v1.8.0