From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +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 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 a95ffec..41cc47b 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
@@ -14,9 +14,9 @@
@TableName("score_use_record")
public class ScoreUseRecord extends BaseEntity{
@Extend
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
-
+
@@ -25,7 +25,7 @@
*/
- private Integer recType;
+ private Integer type;
/**
* 数量
@@ -40,7 +40,10 @@
private Long businessId;
-
+ /**
+ * 操作人id
+ */
+ Long oprationUserId;
/**
* 积分卡ID
*/
@@ -65,10 +68,12 @@
/**
* 操作人ID
*/
+ private String openId;
+ private Long vipId;
- private Long userId;
-
+ private Long shopId;
+
/**
* 备注
*/
--
Gitblit v1.9.1