From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index cb93426..e449263 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -63,6 +63,7 @@
@TableField(exist = false)
private LocalDateTime createTime;
+
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -70,4 +71,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @TableField(exist = false)
+ private Long topProductParentId;
}
--
Gitblit v1.9.3