From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index 54f5883..1efaedb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -5,11 +5,7 @@
import cn.afterturn.easypoi.handler.inter.IExcelModel;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelAutoColumnSize;
import com.vincent.rsf.server.manager.entity.excel.annotation.ExcelComment;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -24,9 +20,9 @@
@Data
@ExcelAutoColumnSize
@Accessors(chain = true)
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = false)
-public class AsnOrderTemplate implements IExcelModel, IExcelDataModel, Serializable {
+//@ToString(callSuper = true)
+//@EqualsAndHashCode(callSuper = false)
+public class AsnOrderTemplate implements Serializable {
@Excel(name = "琛屽彿")
@ExcelComment(value = "platItemId", example = "1357564255478")
@@ -84,27 +80,4 @@
@ExcelComment(value = "memo",example = "娉細鏄撶鍝侊紝杞绘嬁鏀�")
private String memo;
- private Integer rowNum;
-
- private String errorMsg;
-
- @Override
- public Integer getRowNum() {
- return this.rowNum;
- }
-
- @Override
- public void setRowNum(Integer rowNum) {
- this.rowNum = rowNum;
- }
-
- @Override
- public String getErrorMsg() {
- return this.errorMsg;
- }
-
- @Override
- public void setErrorMsg(String errorMsg) {
- this.errorMsg = errorMsg;
- }
}
--
Gitblit v1.9.1