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

Junjie

2025-07-15 ca2a6d455604056ce628f296911f6abac85a7598

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -446,7 +446,10 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
            if(Cools.isEmpty(user.getNickname())){
                return String.valueOf(user.getUsername());
            }
            return String.valueOf(user.getNickname());
        }
        return null;
    }