From d3ae08fbd8634429150f8a54bc779efdfd9aa1e2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 19:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
index 8143561..5104777 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserService.java
@@ -1,12 +1,13 @@
package com.consum.base.service;
+import com.consum.base.pojo.response.FinSysTenantUserVO;
import java.util.List;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
-import com.walker.db.page.GenericPager;
import com.walker.jdbc.service.BaseService;
/**
@@ -17,7 +18,7 @@
**/
public interface FinSysTenantUserService extends BaseService {
- GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param);
+ PageUtil<FinSysTenantUserVO> queryAllPageUser(FinSysTenantUserSearchParam param);
FinSysTenantUser queryOneById(String id);
@@ -33,7 +34,7 @@
FinSysTenantUser getByUserCode(String userCode);
- List<S_role> getByUserId(Long userId);
+ List<S_role> getRoleBySysUserId(Long userId);
List<S_role> getRoleAll();
--
Gitblit v1.9.1