From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AccountService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java
index 7c94cc8..ad57c69 100644
--- a/src/main/java/com/moral/service/AccountService.java
+++ b/src/main/java/com/moral/service/AccountService.java
@@ -12,6 +12,8 @@
Map<String, Object> screenLogin(Map<String, Object> parameters);
+ Map<String, Object> screenLoginNew(Map<String, Object> parameters);
+
Account getAccountByAccountName(String account);
Account getAccountById(Integer id);
@@ -32,9 +34,11 @@
Map<String, Object> getOrganizationIdByAccountId(String id);
- List<Account> getAccountList(String accountName);
-
List<Role> getRolesByAccountName(String accountName);
Map<String, Object> getMenuListsByAccountName(String accountName);
+
+ Map<String, Object> webLogin(Map<String, Object> parameters);
+
+ Map<String, Object> getAccountInfoById(String accountId);
}
--
Gitblit v1.8.0