From 1c4beec65e4601466791a45462b1b12ac79aba6b Mon Sep 17 00:00:00 2001
From: E1ED922C1E9526DD63272D7EC5C6CB77 <E1ED922C1E9526DD63272D7EC5C6CB77@i-search.com.cn>
Date: 星期一, 02 十一月 2020 19:47:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/common/BaseController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/hx/common/BaseController.java b/src/main/java/com/hx/common/BaseController.java
index 5c5a168..de5f6dc 100644
--- a/src/main/java/com/hx/common/BaseController.java
+++ b/src/main/java/com/hx/common/BaseController.java
@@ -1,5 +1,6 @@
package com.hx.common;
+import com.hx.common.service.CommonService;
import com.hx.exception.ParamException;
import com.hx.exception.ServiceException;
import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -9,6 +10,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.context.request.WebRequest;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.text.DateFormat;
@@ -23,6 +25,9 @@
public class BaseController {
+ @Resource
+ protected CommonService commonService;
+
/*璇蜂笉瑕佸０鏄庡彉閲忥紝浼氬鑷翠笉瀹夊叏锛屽洜涓鸿繖涓槸鍗曞垪*/
//鍙渶瑕佸姞涓婁笅闈㈣繖娈靛嵆鍙紝娉ㄦ剰涓嶈兘蹇樿娉ㄨВ
--
Gitblit v1.8.0