From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java
index 0fcd776..ad76f7f 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java
@@ -7,12 +7,13 @@
@Data
@ApiModel(value = "AddSaleManApplyDto", description = "查询参数")
public class AddSaleManApplyDto {
-
+
@ApiModelProperty(value ="会员ID")
- private String userId;
+ private Long userId;
+
@ApiModelProperty(value ="等级ID")
- private String gradeId;
+ private Long gradeId;
@ApiModelProperty(hidden = true)
private Long companyId;
--
Gitblit v1.9.1