Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

1
2
3
4
5
6
7
8
9
10
11
package com.moral.service; 
 
import java.util.Map; 
 
public interface TokenService { 
 
    Map<String, Object> getAuthToken(String type, String username, String password, String url); 
 
    Map<String, Object> getAuthToken(String token, String url); 
 
}