From 89255f6e9692026ffe4ce20bf4454c963a35ad69 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 26 五月 2025 12:56:30 +0800 Subject: [PATCH] 移库任务优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java index 399c785..440eba3 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -50,7 +52,7 @@ * 灞炴�ф牸寮� */ @ApiModelProperty(value= "灞炴�ф牸寮�") - private String property; + private String attrs; /** * 鐘舵�� 1: 姝e父 0: 鍐荤粨 @@ -82,6 +84,7 @@ */ @ApiModelProperty(value= "娣诲姞鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** @@ -95,6 +98,7 @@ */ @ApiModelProperty(value= "淇敼鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date updateTime; /** @@ -105,10 +109,10 @@ public BatchRegular() {} - public BatchRegular(String name,String code,String property,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + public BatchRegular(String name,String code,String attrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.name = name; this.code = code; - this.property = property; + this.attrs = attrs; this.status = status; this.deleted = deleted; this.tenantId = tenantId; -- Gitblit v1.9.1