From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanDetailDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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..a16bfa5 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
@@ -15,6 +15,12 @@
 	
 	@ApiModelProperty(value ="会员OPENID")
 	private String userId;
+
+	@ApiModelProperty(value ="申请记录ID")
+	private String applyId;
+
+    @ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
+    private Integer orderType;
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;

--
Gitblit v1.9.1