From 72396cbbb60d0418dd4cb63f310532fc70a28c10 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 16 Mar 2021 17:59:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- 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