From 112473768acb75b2f9bd7eca3da035ed624e5123 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Apr 2021 17:52:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java |   10 ++++++++--
 1 files changed, 8 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 bd2f6a1..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,14 @@
 	@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;
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;

--
Gitblit v1.9.1