Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs

hmpc

2024-11-18 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39

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

@@ -91,29 +91,11 @@
//            null    // 添加时间
//    );

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
    }

    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getAppeTime$(){