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

zjj

2023-12-27 d814bde01eb91d1544b718463cd31317726bbf6b

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

@@ -489,6 +489,13 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime);
    }

    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.updateBy);