From 98de7181a8e13420734f75d2eba62f1aef298643 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 13 一月 2025 19:39:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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..6f5d07f 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 @@ -177,6 +177,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