From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44: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, 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