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/dto/ProcessContentDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProcessContentDto.java b/src/main/java/com/ruoyi/production/dto/ProcessContentDto.java
index 88c15f1..5bc0e6b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessContentDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessContentDto.java
@@ -20,7 +20,7 @@
 public class ProcessContentDto implements Serializable {
     private String id;
     private Long processId;             // 宸ュ簭id
-    private String processContent;    // 宸ヨ壓鍔犲伐鍐呭
+    private String processName;    // 宸ヨ壓鍔犲伐鍐呭
     private String openCount;         // 寮�鏁�
     private String processPositive;   // 宸ヨ壓姝f暟
     private String allowanceQty;      // 鍔犳斁鏁�

--
Gitblit v1.9.3