Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-03-11 4edd63bcd21b999e0782047ca0602f9e915cd94c

 screen-manage/src/main/java/com/moral/api/controller/AccountController.java

@@ -24,7 +24,7 @@
        if(!ObjectUtils.checkParamAndMap(paramters,"account","password"))
            return  ResultMessage.fail("参数不完整");
        Map<String, Object> result = accountService.login(paramters);
        if(result.get("accountId").equals(-1))
        if((int)result.get("accountId")<0)
            return ResultMessage.fail(result);
        return ResultMessage.ok(result);
    }