From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 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 5800467..acb2845 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;
@@ -33,12 +33,6 @@
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
- /**
- * 鏍囪瘑
- */
- @ApiModelProperty(value= "鏍囪瘑")
- private String uuid;
/**
* 鍚嶇О
@@ -109,10 +103,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value = "瀛愮被")
+ @TableField(exist = false)
+ private List<MatnrGroup> children;
+
public MatnrGroup() {}
- public MatnrGroup(String uuid,String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
+ public MatnrGroup(String name,String code,Long parentId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
this.parentId = parentId;
--
Gitblit v1.9.1