From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 10 三月 2025 17:06:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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 b97c928..30f8dad 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 @@ -1,16 +1,14 @@ package com.vincent.rsf.server.manager.entity; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; + import java.text.SimpleDateFormat; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,9 +18,11 @@ import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; import java.util.Date; +import java.util.List; @Data @TableName("man_matnr_group") +@ApiModel(value = "MatnrGroup", description = "鐗╂枡鍒嗙被淇℃伅") public class MatnrGroup implements Serializable { private static final long serialVersionUID = 1L; @@ -102,6 +102,10 @@ */ @ApiModelProperty(value= "澶囨敞") private String memo; + + @ApiModelProperty(value = "瀛愮被") + @TableField(exist = false) + private List<MatnrGroup> children; public MatnrGroup() {} @@ -192,4 +196,8 @@ } } + public String getLabel(){ + return this.name; + } + } -- Gitblit v1.9.1