From 8595059e236d4a2fa034be18d40b9d6a61e12525 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 15 Mar 2021 14:37: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 |    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