From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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 2918b8e..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;
 
@@ -177,6 +179,31 @@
     @TableField(exist = false)
     private String applyReason;
 
+    @ApiModelProperty("代派单")
+    @TableField(exist = false)
+    private Integer toBeDispatched=0;
+    @ApiModelProperty("待上门")
+    @TableField(exist = false)
+    private Integer stayDoorstep=0;
+    @ApiModelProperty("带完工")
+    @TableField(exist = false)
+    private Integer toBeCompleted=0;
+    @ApiModelProperty("已完结")
+    @TableField(exist = false)
+    private Integer completed=0;
+    @ApiModelProperty("已取消")
+    @TableField(exist = false)
+    private Integer canceled =0;
+    @ApiModelProperty("再投数量")
+    @TableField(exist = false)
+    private Integer reInvestment=0;
+
+
+
+
+
+
+
     @ApiModelProperty("是否为再投单")
     @TableField("is_reinvest")
     private Integer isReinvest;

--
Gitblit v1.7.1