From dc717956d674f7e307453e6da74077733137683a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 十二月 2025 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
index 8694565..2ee35f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
@@ -6,7 +6,9 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -33,95 +35,138 @@
 
     @TableId(value = "id",  type = IdType.ASSIGN_ID)
     private String id;
+    @TableField("insurance_id")
+    @ApiModelProperty(value = "保险id")
+    private String insuranceId;
     @TableField("app_user_id")
+    @ApiModelProperty(value = "用户id")
     private String appUserId;
+
+    @TableField("name")
+    @ApiModelProperty(value = "姓名")
     private String name;
+    @TableField("phone")
+    @ApiModelProperty(value = "手机号")
     private String phone;
     @TableField("id_card")
+    @ApiModelProperty(value = "身份证号码")
     private String idCard;
     /**
      * 支付凭证
      */
+    @TableField("img")
+    @ApiModelProperty(value = "支付凭证")
     private String img;
     /**
      * 1线上2线下
      */
     @TableField("pay_type")
+    @ApiModelProperty(value = "1线上2线下")
     private Integer payType;
     /**
      * 支付编号
      */
     @TableField("pay_no")
+    @ApiModelProperty(value = "支付编号")
     private String payNo;
     /**
      * 支付金额
      */
     @TableField("pay_money")
+    @ApiModelProperty(value = "支付金额")
     private BigDecimal payMoney;
     /**
      * 支付时间
      */
     @TableField("pay_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "支付时间")
     private Date payTime;
+    @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "截至时间")
+    private Date endTime;
     /**
      * 支付流水号
      */
     @TableField("transaction_id")
+    @ApiModelProperty(value = "支付流水号")
     private String transactionId;
     /**
      * 0未付款 1已退  2已支付
      */
     @TableField("status")
+    @ApiModelProperty(value = "0未付款 1已退  2已支付 3已过期")
     private Integer status;
     /**
      * 退款时间
      */
     @TableField("refund_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "退款时间")
     private Date refundTime;
     /**
      * 申请退款时间
      */
     @TableField("request_refund_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "申请退款时间")
     private Date requestRefundTime;
+
+    @ApiModelProperty(value = "银行卡号")
+    @TableField("bank_card_number")
+    private String bankCardNumber;
+
+    @ApiModelProperty(value = "持卡人姓名")
+    @TableField("cardholder_name")
+    private String cardholderName;
     /**
      * 退款金额
      */
     @TableField("refund_money")
+    @ApiModelProperty(value = "退款金额")
     private Double refundMoney;
     /**
      * 退款原因
      */
     @TableField("refund_reason")
+    @ApiModelProperty(value = "退款原因")
     private String refundReason;
     /**
      * 申请退款原因图片
      */
     @TableField("refund_reason_pictures")
+    @ApiModelProperty(value = "申请退款原因图片")
     private String refundReasonPictures;
     /**
      * 退款单号
      */
     @TableField("refund_number")
+    @ApiModelProperty(value = "退款单号")
     private String refundNumber;
     /**
      * 退款流水号
      */
     @TableField("refund_transaction_id")
+    @ApiModelProperty(value = "退款流水号")
     private String refundTransactionId;
     /**
      * 退款审核状态 1=待审核 2=通过 3=驳回
      */
     @TableField("refund_status")
+    @ApiModelProperty(value = "退款审核状态 1=待审核 2=通过 3=驳回")
     private Integer refundStatus;
     /**
      * 退款凭证
      */
     @TableField("refund_voucher")
+    @ApiModelProperty(value = "退款凭证")
     private String refundVoucher;
     /**
      * 驳回原因
      */
     @TableField("reject_reason")
+    @ApiModelProperty(value = "驳回原因")
     private String rejectReason;
 
 

--
Gitblit v1.7.1