From 7221352ba76f0841cd9c93cc8d57c2b233c5d6fe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 21:23:02 +0800
Subject: [PATCH] 2024-10-28 营销模块获取农户数据接口，筛选条件增加水卡编号

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 57b15a9..9a85b2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -31,6 +31,7 @@
     /**
      * 璁㈠崟鍙�
      */
+    @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
     @ColumnWidth(25)
     private String orderNumber;
 
@@ -45,19 +46,21 @@
      * 姘村崱缂栧彿
      */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
-    @ColumnWidth(15)
-    private Long cardNum;
+    @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+    @ColumnWidth(20)
+    private String cardNum;
 
     /**
      * 韬唤璇佸彿
      */
+    @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
     @ColumnWidth(15)
     private String idCard;
 
     /**
      * 鍐滄埛缂栧彿
      */
-    //@ExcelIgnore
+    @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
     @ColumnWidth(15)
     private String clientNum;
 
@@ -113,6 +116,7 @@
     /**
      * 浣欓
      */
+    @ExcelProperty(value = {"${title}", "浣欓"})
     @ColumnWidth(15)
     private Double money;
 
@@ -141,12 +145,14 @@
     /**
      * 鏀堕摱鍛樺鍚�
      */
+    @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
     @ColumnWidth(15)
     private String cashierName;
 
     /**
      * 鍗＄墖鐘舵��
      */
+    @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
     @ColumnWidth(15)
     private String cardState;
 
@@ -154,7 +160,7 @@
      * 鏉戝簞鍚嶇О
      */
     @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
-    @ColumnWidth(20)
+    @ColumnWidth(35)
     private String districtTitle;
 
     /**

--
Gitblit v1.8.0