From 60e49d600834344ae1b18357e76df74fbe160527 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 二月 2026 10:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java b/server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java
index c301749..3dc860f 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ImportRecord.java
@@ -83,11 +83,22 @@
@ExcelColumn(name="瀵煎叆澶辫触璁板綍鏁�",index=18 ,width=10)
private Integer errorNum;
@TableField(exist = false)
- private List<CasesImport> caseList;
+ private List<Cases> caseList;
@TableField(exist = false)
- private List<MemberImport> memberList;
+ private List<Member> memberList;
@TableField(exist = false)
private List<PictureData> pictureDataList;
-
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍛橈紱", example = "1")
+ @TableField(exist = false)
+ private String updateUserName;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿锛�", example = "1")
+ @TableField(exist = false)
+ private Date starttime;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿锛�", example = "1")
+ @TableField(exist = false)
+ private Date endtime;
+ @ApiModelProperty(value = "杩涜涓凡澶勭悊鐨勬暟閲忥紱", example = "1")
+ @TableField(exist = false)
+ private Integer ingNum;
}
--
Gitblit v1.9.3