From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
index dc4707c..fdcb92f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
@@ -6,6 +6,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -119,19 +120,19 @@
* 鍒剁増
*/
@TableField(value = "plate_making",typeHandler = JacksonTypeHandler.class)
- private List<PlateMakingDto> plateMaking;
+ private List<PlateMakingDto> plateMaking = new ArrayList<>();
/**
* 宸ュ簭鍔犲伐鍐呭
*/
@TableField(value = "process_content",typeHandler = JacksonTypeHandler.class)
- private List<ProcessContentDto> processContent;
+ private List<ProcessContentDto> processContent = new ArrayList<>();
/**
* 鏉愭枡淇℃伅
*/
@TableField(value = "material_info",typeHandler = JacksonTypeHandler.class)
- private List<MaterialInfoDto> materialInfo;
+ private List<MaterialInfoDto> materialInfo = new ArrayList<>();
/**
* 宸ヨ壓瑕佹眰
--
Gitblit v1.9.3