From bb5be7a8a6ac24fbf66f03f070751577b87c95ca Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 15 Apr 2021 17:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
index fe2bd5e..39387a6 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
@@ -1,33 +1,25 @@
package com.matrix.system.fenxiao.dto;
-import com.matrix.core.pojo.PaginationDto;
+import com.matrix.core.pojo.BasePageQueryDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
@ApiModel(value = "ShopSalesmanApplyDto", description = "查询参数")
-public class ShopSalesmanApplyDto extends PaginationDto {
+public class ShopSalesmanApplyDto extends BasePageQueryDto {
@ApiModelProperty(value ="审核状态")
private Integer shenheState;
+ @ApiModelProperty(value ="分销员等级")
+ private Long salemanGrade;
+ @ApiModelProperty(value ="会员姓名")
+ private String userName;
+
@ApiModelProperty(hidden = true)
private Long companyId;
- public Integer getShenheState() {
- return shenheState;
- }
-
- public void setShenheState(Integer shenheState) {
- this.shenheState = shenheState;
- }
-
- public Long getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
- }
}
--
Gitblit v1.9.1