From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
index f1a51b1..dbaddfc 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
@@ -1,11 +1,13 @@
package com.dsh.other.entity;
import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+
import java.io.Serializable;
import java.util.Date;
@@ -15,7 +17,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author administrator
@@ -27,7 +29,7 @@
@TableName("t_game_record")
public class TGameRecord extends Model<TGameRecord> {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -43,6 +45,11 @@
*/
@TableField("payType")
private Integer payType;
+ /**
+ * 场地id
+ */
+ @TableField("siteId")
+ private Integer siteId;
/**
* 金额
@@ -61,6 +68,22 @@
private Date time;
+ /**
+ * 分账流水号
+ */
+ @TableField("fenzhangNo")
+ private String fenzhangNo;
+ /**
+ * 分账业务号 存值表明已分账 未存表明未分账
+ */
+ @TableField("fenzhangOrderNo")
+ private String fenzhangOrderNo;
+ // 分账金额
+ @TableField("fenzhangAmount")
+ private BigDecimal fenzhangAmount;
+ // 分账回退流水号
+ @TableField("fenzhangRefundNo")
+ private String fenzhangRefundNo;
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1