From 75f1c8f7380994e032de7d32ca7890dff543aaa2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 21 Jul 2021 10:19:15 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 e9e771e..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,8 +13,11 @@
@ApiModelProperty(value ="会员姓名")
private String userName;
- @ApiModelProperty(value ="会员OPENID")
- private String userId;
+ @ApiModelProperty(value ="会员ID")
+ private Long userId;
+
+ @ApiModelProperty(value ="申请记录ID")
+ private Long applyId;
@ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
private Integer orderType;
--
Gitblit v1.9.1