From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java
index 7e287db..006e414 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java
@@ -1,10 +1,11 @@
 package com.matrix.system.fenxiao.dto;
 
 import com.matrix.core.pojo.BasePageQueryDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 @Data
 @ApiModel(value = "LoadFenxiaoOrderListDto", description = "查询参数")
@@ -12,8 +13,29 @@
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;
+	
+	@ApiModelProperty(value ="订单状态")
+	private Integer ddType;
+	
+	@ApiModelProperty(value ="结算状态")
+	private Integer orderType;
 
-	@ApiModelProperty(value ="会员姓名")
+	@ApiModelProperty(value ="客户名称")
 	private String userName;
+	
+	@ApiModelProperty(value ="推广员名称")
+	private String tgy;
+	
+	@ApiModelProperty(value ="开始时间")
+	private Date startTime;
+	
+	@ApiModelProperty(value ="结束时间")
+	private Date endTime;
+	
+	@ApiModelProperty(value ="结算编号")
+	private String jsbh;
+	
+	@ApiModelProperty(value ="订单号")
+	private String ddh;
 
 }

--
Gitblit v1.9.1