From 0b6189c1c208a4f1c4cd4b230dba10b3581d1ff9 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 16 五月 2024 16:01:16 +0800
Subject: [PATCH] fix: 获取司机配送员信息接口修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderStatusCount.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 780d760..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,19 +16,19 @@
@Data
//@Excel("绛炬敹鐘舵�佺粺璁℃姤琛�")
+@ExcelIgnoreUnannotated
public class OrderStatusCount {
- @ContentLoopMerge(eachRow = 5)
@ExcelProperty(value = "杞﹀彿")
@TableField(value = "carName")
private String carName;
- @ContentLoopMerge(eachRow = 5)
+ //@ContentLoopMerge(eachRow = 5)
@ExcelProperty("濮撳悕")
@TableField(value = "userName")
//@ExcelIgnore
private String userName;
// @ContentLoopMerge(eachRow = 5)
- @ContentLoopMerge(eachRow = 5)
+ //@ContentLoopMerge(eachRow = 5)
@ExcelProperty("绾胯矾")
@TableField(value = "line")
private String line;
@@ -50,7 +52,7 @@
@TableField(value = "proportion")
private String proportion;
- @ContentLoopMerge(eachRow = 5)
+ // @ContentLoopMerge(eachRow = 5)
@ExcelProperty("骞冲潎绛炬敹鐜�")
@TableField(value = "name")
//@ExcelIgnore
--
Gitblit v1.9.1