From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java
index 36a5df2..73c6ff9 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/FyfaManageDto.java
@@ -13,8 +13,8 @@
 	@ApiModelProperty(hidden = true)
 	private Long companyId;
 	
-	@ApiModelProperty(value ="会员OPENID")
-	private String userId;
+	@ApiModelProperty(value ="会员ID")
+	private Long userId;
 	
 	@ApiModelProperty(value ="申请记录ID")
 	 private Long applyId;

--
Gitblit v1.9.1