From 949e7e46086e034d747746d2b450d7c262c9a594 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 16 Apr 2021 10:57: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/LoadParamSettingDto.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java
index 65c479b..50cfac5 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.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(hidden = true)
 	private Long companyId;

--
Gitblit v1.9.1