From e8f0b3422d307c686b3a81269f9e9e4fb34a846e Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期五, 12 四月 2024 10:49:46 +0800
Subject: [PATCH] 指纹登陆返回客户端加密信息
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java
index f85d9b6..55973dc 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java
@@ -2,9 +2,11 @@
import cn.exrick.xboot.core.base.XbootBaseEntity;
import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
+import com.alibaba.excel.annotation.write.style.OnceAbsoluteMerge;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
@@ -14,15 +16,23 @@
@Data
//@Excel("绛炬敹鐘舵�佺粺璁℃姤琛�")
+@ExcelIgnoreUnannotated
public class OrderStatusCount {
- // @ContentLoopMerge(eachRow = 5)
- @ExcelProperty("杞﹀彿")
+ @ExcelProperty(value = "杞﹀彿")
@TableField(value = "carName")
private String carName;
+
+ //@ContentLoopMerge(eachRow = 5)
+ @ExcelProperty("濮撳悕")
+ @TableField(value = "userName")
+ //@ExcelIgnore
+ private String userName;
// @ContentLoopMerge(eachRow = 5)
+ //@ContentLoopMerge(eachRow = 5)
@ExcelProperty("绾胯矾")
@TableField(value = "line")
private String line;
+
@ExcelProperty("鎵规")
@TableField(value = "batch")
private String batch;
@@ -41,7 +51,14 @@
@ExcelProperty("绛炬敹鐜�")
@TableField(value = "proportion")
private String proportion;
- @ExcelProperty("鏃ユ湡")
+
+ // @ContentLoopMerge(eachRow = 5)
+ @ExcelProperty("骞冲潎绛炬敹鐜�")
+ @TableField(value = "name")
+ //@ExcelIgnore
+ private String name;
+ //@ExcelProperty("鏃ユ湡")
+ @ExcelIgnore
@ColumnWidth(20)
private String sendDate;
// 1 鎸夋棩鏌ヨ 3鎸夋湀鏌ヨ
@@ -61,10 +78,9 @@
private String carId;
@ExcelIgnore
private String carNo;
- @ExcelIgnore
- private String name;
- @ExcelIgnore
- private String userName;
+ /* @ExcelIgnore
+ private String name;*/
+
@ExcelIgnore
private String carTime;
--
Gitblit v1.9.1