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/ProductProcessDto.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
index 51d7314..eaa00fc 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
@@ -1,20 +1,19 @@
package com.ruoyi.production.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductProcess;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel
public class ProductProcessDto extends ProductProcess {
+ @ApiModelProperty(value = "鎶ュ伐鐢ㄦ埛鍚嶇О")
+ private String userNames;
- @ApiModelProperty("璁惧鍚嶇О")
- @Excel(name = "璁惧鍚嶇О")
- private String deviceName;
+ @ApiModelProperty(value = "鎶ュ伐鐢ㄦ埛id")
+ private List<Long> ids;
}
--
Gitblit v1.9.3