Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

tzsk

7 天以前 6fd6fd0b4e90a816989632506934bdfdb431f47f

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

@@ -51,9 +51,6 @@

    protected User getUser(){
        User user = userService.selectById(getUserId());
        if (null == user) {
            throw new CoolException(BaseRes.DENIED);
        }
        return user;
    }