From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 09 Jul 2021 20:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UnbundlingSaleManDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UnbundlingSaleManDto.java
index da71cea..6ab0ba2 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UnbundlingSaleManDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UnbundlingSaleManDto.java
@@ -8,8 +8,8 @@
 @ApiModel(value = "UnbundlingSaleManDto", description = "查询参数")
 public class UnbundlingSaleManDto {
 	
-	@ApiModelProperty(value ="会员OPENID")
-	private String userId;
+	@ApiModelProperty(value ="会员ID")
+	private Long userId;
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;

--
Gitblit v1.9.1