From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
index fd9b9ef..655d182 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
@@ -1,8 +1,7 @@
package com.ruoyi.production.dto;
+import com.ruoyi.production.pojo.ProductProcess;
import lombok.Data;
-
-import java.math.BigDecimal;
@Data
public class ProcessRouteAnticlockwiseDto {
@@ -12,13 +11,23 @@
//宸ュ簭鍚嶇О
private String processRouteName;
//宸ュ簭寮�鏁�
- private BigDecimal processRouteOpenNum;
+ private String processRouteOpenNum;
//宸ヨ壓姝ｆ暟
- private BigDecimal processRouteNum;
+ private String processRouteNum;
//鍔犳斁鏁�
- private BigDecimal processRouteAddNum;
+ private String processRouteAddNum;
//宸ヨ壓瑕佹眰
private String processRouteRequire;
private Long productModelId;
+
+ //浜哄憳ids
+ private String userIds;
+ private String userNames;
+ // 鏈哄彴id
+ private Long deviceId;
+
+ private String uuid;
+
+ private ProductProcess productProcess;;
}
--
Gitblit v1.9.3