From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
index 688ab4d..9904ef6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java
@@ -8,6 +8,7 @@
import lombok.ToString;
import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@@ -18,32 +19,34 @@
* @create 2025/3/3 08:40
*/
@Data
-@ExcelAutoColumnSize
-@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
-public class MatnrsTemplate implements Serializable {
+public class MatnrsTemplate {
+ @NotNull
@Excel(name = "鐗╂枡鍚嶇О")
@ExcelComment(example = "鍗庝负鎵嬫満")
private String name;
+ @NotNull
@Excel(name = "鍒嗙被鍔╄鐮�")
@ExcelComment(example = "256874556")
private String groupCode;
+ @NotNull
@Excel(name = "鍒嗙被鍚嶇О")
@ExcelComment(example = "绉诲姩璁惧")
private String groupName;
+ @NotNull
@Excel(name = "鐗╂枡鍔╄鐮�")
@ExcelComment(example = "P3528461569")
private String erpCode;
+ @NotNull
@Excel(name = "瑙勬牸")
@ExcelComment(example = "HW-148*68*10")
private String spec;
+ @NotNull
@Excel(name = "鍨嬪彿")
@ExcelComment(example = "鍗庝负涓夋姌鍙�")
private String model;
@@ -68,6 +71,7 @@
@ExcelComment(notNull = false, example = "鏂颁笂甯備笁鎶樺彔")
private String nromNum;
+ @NotNull
@Excel(name = "涓诲崟浣�")
@ExcelComment(example = "閮�")
private String unit;
@@ -88,6 +92,7 @@
@ExcelComment(notNull = false, example = "10")
private String minQty;
+ @NotNull
@Excel(name = "鏈�澶у簱瀛橀噺")
@ExcelComment(notNull = false, example = "150")
private String maxQty;
--
Gitblit v1.9.1