From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java
index a16bfa5..4fda140 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java
@@ -13,11 +13,11 @@
@ApiModelProperty(value ="会员姓名")
private String userName;
- @ApiModelProperty(value ="会员OPENID")
- private String userId;
+ @ApiModelProperty(value ="会员ID")
+ private Long userId;
@ApiModelProperty(value ="申请记录ID")
- private String applyId;
+ private Long applyId;
@ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
private Integer orderType;
--
Gitblit v1.9.1