From cda724da35beb1ffd84955cc42bda5ab399ebbe1 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 09 四月 2025 18:27:38 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java index 6f5d07f..224b8a0 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java @@ -61,7 +61,9 @@ @ApiModelProperty("站点名称") @TableField("site_name") private String siteName; - + @ApiModelProperty("拉起确认收款页面参数") + @TableField("package_info") + private String packageInfo; @ApiModelProperty("回收服务id") @TableField("serve_id") private Integer serveId; @@ -145,7 +147,7 @@ @TableField("subsidy") private BigDecimal subsidy; - @ApiModelProperty("是否已提现(0:未提现,1:已提现)") + @ApiModelProperty("是否已提现(0:未提现,1:审核中 2审核通过 3:已确认收款)") @TableField("is_withdrawal") private Integer isWithdrawal; -- Gitblit v1.7.1