From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 4d6a630..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
@@ -7,16 +7,16 @@
/**
* @description 积分记录表
- * @author yourName
+ * @author jyy
* @date 2021-02-26 15:26
*/
@Data
@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,10 @@
/**
* 操作人ID
*/
+ private Long vipId;
+ private Long shopId;
- private Long userId;
-
/**
* 备注
*/
--
Gitblit v1.9.1