Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

 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);