From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessCardProgressDTO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessCardProgressDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessCardProgressDTO.java
index ad784b5..7f3bba6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessCardProgressDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/ProcessCardProgressDTO.java
@@ -1,6 +1,7 @@
package com.example.erp.dto.pp;
import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
@Data
@@ -14,7 +15,7 @@
@ExcelProperty("娴佺▼鍗″彿")
private String processId;
@ExcelProperty("灏忕墖椤哄簭")
- private String technologyNumber;
+ private Integer technologyNumber;
@ExcelProperty("鏁伴噺")
private Integer quantity;
@ExcelProperty("娆＄牬鏁伴噺")
--
Gitblit v1.8.0