From 6c264ce8c372e18109f0a3b9f5754955d22ba353 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 15 十一月 2023 17:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
index 9907501..3fe8cae 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
@@ -41,5 +41,5 @@
 	 */
 	private List<SysDictItem> sysDictItemList;
 
-
+	private Long templateParentId;
 }

--
Gitblit v1.9.3