From 865c5d54ca63ed7a5bda4a92d27ea0b7c6e61b04 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 17 十二月 2025 18:02:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java
index eb32f6b..aba6329 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBigGiftPackageOrder.java
@@ -1,18 +1,18 @@
package com.ruoyi.system.model;
-import java.math.BigDecimal;
-
import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -116,6 +116,10 @@
@TableField("final_payment_serial_number")
private String finalPaymentSerialNumber;
+ @ApiModelProperty(value = "支付订单号（用于工行支付，多订单合并支付时共用同一个支付订单号）")
+ @TableField("pay_order_code")
+ private String payOrderCode;
+
@ApiModelProperty(value = "删除状态（0=否，1=是）")
@TableField("del_flag")
private Integer delFlag;
@@ -162,6 +166,10 @@
@Excel(name = "审核状态",replace = {"待审核_1","已通过_2","已驳回_3"})
private Integer auditStatus;
+ @ApiModelProperty(value = "是否启用生效日")
+ @TableField("effect_day_flag")
+ private Boolean effectDayFlag;
+
@ApiModelProperty(value = "商品封面")
@TableField(exist = false)
private String bigGiftPackageCover;
--
Gitblit v1.7.1