From 0907687e631c643a4cf0d41c1d2d4a645e69f0a7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 05 三月 2026 15:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 9 +++++++++
1 files changed, 9 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 069b665..36802ac 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -63,4 +63,13 @@
@TableField(exist = false)
private LocalDateTime createTime;
+
+ @TableField(exist = false)
+ private Long parentId;
+
+ @TableField(exist = false)
+ private String parentName;
+
+ @TableField(exist = false)
+ private Long productType;
}
--
Gitblit v1.9.3