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

zjj

2 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

 src/main/java/com/zy/system/entity/OperateLog.java

@@ -80,8 +80,10 @@
        User user = service.selectById(this.userId);
        if (!Cools.isEmpty(user)){
            return user.getUsername();
        } else if (this.userId==9527L){
            return "未知";
        }
        return null;
        return "未知";
    }
    public void setUserId(Long userId) {
        this.userId = userId;