Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

3 天以前 c3e47e5e70a9055b7d25c118eb1f7ec3c869e953

 src/main/java/com/zy/common/web/AuthController.java

@@ -80,6 +80,7 @@
        userLogin.setUserId(user.getId());
        userLogin.setToken(token);
        userLogin.setCreateTime(new Date());
        userLogin.setSystem("WMS");
        userLoginService.insert(userLogin);
        Map<String, Object> res = new HashMap<>();
        res.put("username", user.getUsername());