From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/AccountService.java | 4 ++--
1 files changed, 2 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..0dd7c82 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);
@@ -31,8 +33,6 @@
Account companyLogin(Map<String, Object> parameters);
Map<String, Object> getOrganizationIdByAccountId(String id);
-
- List<Account> getAccountList(String accountName);
List<Role> getRolesByAccountName(String accountName);
--
Gitblit v1.8.0