From 6b8585fc452ecdcaa82d86fab79a9f27bb442851 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
index 9fa5c81..32c0543 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportExcelVO.java
@@ -17,7 +17,7 @@
@NoArgsConstructor
public class MdmItemImportExcelVO {
- @ExcelProperty("鐗╂枡缂栫爜")
+ @ExcelProperty("浜у搧缂栧彿锛堜慨鏀规椂鐢ㄤ簬鍖归厤锛屾柊澧炴椂鑷姩鐢熸垚锛�")
private String code;
@ExcelProperty("鐗╂枡鍚嶇О")
@@ -28,6 +28,12 @@
@ExcelProperty("瑙勬牸鍨嬪彿")
private String specification;
+
+ @ExcelProperty("鎶�鏈弬鏁�")
+ private String technicalParameters;
+
+ @ExcelProperty("浜у搧绫诲瀷锛�1鍘熸潗鏂� 2鍗婃垚鍝� 3鎴愬搧 4杈呮潗 5鍏朵粬锛�")
+ private Integer itemType;
@ExcelProperty("鐗╂枡鍒嗙被缂栫爜")
private String categoryCode;
@@ -74,7 +80,7 @@
@ExcelProperty("淇濊川鏈�(澶�)")
private Integer expiryDay;
- @ExcelProperty("鐘舵��")
+ @ExcelProperty(value = "鐘舵��", converter = StatusTextConverter.class)
private Integer status;
@ExcelProperty("鏄惁鍚屾鍒癕ES")
--
Gitblit v1.9.3