From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +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/score/entity/ScoreUseRecord.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
index 6b2b90f..075e21c 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
@@ -25,7 +25,7 @@
 	 */
 
 
-	private Integer  recType;
+	private Integer  type;
 	
 	/**
 	 * 数量
@@ -68,8 +68,6 @@
 	/**
 	 * 操作人ID
 	 */
-	private String  openId;
-
 	private Long vipId;
 
 	private Long shopId;

--
Gitblit v1.9.1