Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.Transient;
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
@@ -78,7 +79,7 @@ public class CoreReportController extends CoreBaseController {
 
     @GetMapping(value = "/role/user/list")
     @ApiOperation(value = "查询登录用户所有角色")
-    public ResultBean findSysRoleByUser() {
+    public ResultBean findSysRoleByUser(HttpServletRequest req) {
         try {
             SessionUser sessionUser = getSessionUser();
             if(sessionUser != null && sessionUser.getUser() != null){