From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 372c340..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
@@ -1,7 +1,9 @@
 package com.chinaztt.mes.basic.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.chinaztt.mes.basic.entity.Param;
 import com.chinaztt.ztt.admin.api.entity.SysDictItem;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.util.List;
@@ -18,10 +20,12 @@
 	/**
 	 * 鎺掑簭
 	 */
+	@JSONField(serializeUsing= ToStringSerializer.class)
 	private Long index;
 	/**
 	 * 宸ヤ綔绔檌d
 	 */
+	@JSONField(serializeUsing= ToStringSerializer.class)
 	private Long workstationId;
 	/**
 	 * 鍊�
@@ -37,4 +41,5 @@
 	 */
 	private List<SysDictItem> sysDictItemList;
 
+	private Long templateParentId;
 }

--
Gitblit v1.9.3