From 20381172d906c4092b9249a9aea2aec85c1bf4e4 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 24 五月 2025 16:59:25 +0800 Subject: [PATCH] #逻辑删除 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java index 87deb71..14431b9 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java @@ -4,6 +4,8 @@ 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; @@ -21,8 +23,8 @@ import java.util.List; @Data -@ApiModel(value = "鐗╂枡绫�") @TableName("man_matnr_group") +@ApiModel(value = "MatnrGroup", description = "鐗╂枡鍒嗙被淇℃伅") public class MatnrGroup implements Serializable { private static final long serialVersionUID = 1L; @@ -41,9 +43,15 @@ private String name; /** + * 鍒嗙粍缂栫爜 + */ + @ApiModelProperty("涓婄骇鍒嗙粍缂栫爜") + private String parCode; + + /** * 鐗╂枡缂栫爜 */ - @ApiModelProperty(value= "鐗╂枡缂栫爜") + @ApiModelProperty(value= "鍒嗙粍缂栫爜") private String code; /** @@ -82,6 +90,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 +104,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; /** @@ -196,4 +206,8 @@ } } + public String getLabel(){ + return this.name; + } + } -- Gitblit v1.9.1