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

野心家

2025-06-05 c3e47e5e70a9055b7d25c118eb1f7ec3c869e953

 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;