From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
index 8a8fd87..0e331e2 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkCountInView.java
@@ -1,11 +1,19 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@Data
public class ViewWorkCountInView {
+ @ExcelProperty("鍏ュ簱鏃ユ湡")
private String oneday;
+
+ @ExcelProperty("鐗╂枡鍙�")
private String matnr;
+
+ @ExcelProperty("鏃ユ湡鏍囬")
private String maktx;
+
+ @ExcelProperty("鏁伴噺")
private String anfme;
}
--
Gitblit v1.9.1