From 17caebabf7a6a529b7039c71e21e5a324e31ea20 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2024 16:23:42 +0800
Subject: [PATCH] 代理新功能完善

---
 src/main/java/com/taoke/autopay/dto/admin/OrderExcelDataDto.java |  141 +++-------------------------------------------
 1 files changed, 11 insertions(+), 130 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/dto/admin/OrderExcelDataDto.java b/src/main/java/com/taoke/autopay/dto/admin/OrderExcelDataDto.java
index d091b1f..94b90ec 100644
--- a/src/main/java/com/taoke/autopay/dto/admin/OrderExcelDataDto.java
+++ b/src/main/java/com/taoke/autopay/dto/admin/OrderExcelDataDto.java
@@ -1,6 +1,9 @@
 package com.taoke.autopay.dto.admin;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
 
 /**
  * @author hxh
@@ -8,8 +11,13 @@
  * @description: 璁㈠崟excel杈撳嚭
  * @date 2024/7/18 22:44
  */
-
+@Data
+@Builder
 public class OrderExcelDataDto {
+    @Tolerate
+    public OrderExcelDataDto(){
+
+    }
 
     @ExcelProperty("ID")
     private String id;
@@ -43,134 +51,7 @@
     private int totalCount;
     @ExcelProperty("鎬婚噾棰�")
     private String totalMoney;
+    @ExcelProperty("鍟嗗鍚嶇О")
+    private String payMerchant;
 
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Long getUid() {
-        return uid;
-    }
-
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getPaySuccess() {
-        return paySuccess;
-    }
-
-    public void setPaySuccess(String paySuccess) {
-        this.paySuccess = paySuccess;
-    }
-
-    public String getOrderMoney() {
-        return orderMoney;
-    }
-
-    public void setOrderMoney(String orderMoney) {
-        this.orderMoney = orderMoney;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getOrderChannel() {
-        return orderChannel;
-    }
-
-    public void setOrderChannel(String orderChannel) {
-        this.orderChannel = orderChannel;
-    }
-
-    public int getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(int totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public String getTotalMoney() {
-        return totalMoney;
-    }
-
-    public void setTotalMoney(String totalMoney) {
-        this.totalMoney = totalMoney;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getStateDesc() {
-        return stateDesc;
-    }
-
-    public void setStateDesc(String stateDesc) {
-        this.stateDesc = stateDesc;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(String payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getPayDevice() {
-        return payDevice;
-    }
-
-    public void setPayDevice(String payDevice) {
-        this.payDevice = payDevice;
-    }
-
-    public String getAgent() {
-        return agent;
-    }
-
-    public void setAgent(String agent) {
-        this.agent = agent;
-    }
 }

--
Gitblit v1.8.0