From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/ParamJoinTemplate.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/ParamJoinTemplate.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/ParamJoinTemplate.java
index 143c0cb..e3e3487 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/ParamJoinTemplate.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/ParamJoinTemplate.java
@@ -60,5 +60,7 @@
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	@ApiModelProperty(value = "榛樿鍊�")
 	private String defaultValue;
+
+	private Long parentId;
 }
 

--
Gitblit v1.9.3