Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

8 天以前 760b4f0509bbdc0605ea51060f4b844b315b625f

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java

@@ -64,7 +64,8 @@
    public R login(@RequestBody LoginParam param, HttpServletRequest request) {
        String username = param.getUsername();
        User user = userService.getByUsername(username
                , configProperties.getSystemMode().equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
                , configProperties.getSystemMode()
                        .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
        );
        if (user == null) {
            return R.parse(BusinessRes.USERNAME_NOT_EXIST);