From c6d53fb96a2e7ac88108155b604ddcef83f2fb37 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 八月 2025 10:49:09 +0800
Subject: [PATCH] 加盟商新增时撤回密码默认修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
index b03a4b2..785b0b5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -34,6 +34,9 @@
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
@TableField("province_code")
private String provinceCode;
@TableField("are_code")
@@ -61,6 +64,8 @@
@ApiModelProperty("打印次数")
@TableField("print_count")
private Integer printCount;
+ @TableField("msg_count")
+ private Integer msgCount;
@ApiModelProperty("回收服务名称")
@@ -112,7 +117,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，7：待预约)")
@TableField("state")
private Integer state;
@@ -142,7 +147,7 @@
@TableField("subsidy")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
@TableField("is_withdrawal")
private Integer isWithdrawal;
@@ -192,5 +197,6 @@
@ApiModelProperty("回收单凭证(多张照片 ','隔开)")
@TableField("paper_pic")
private String paperPic;
-
+ @ApiModelProperty("拉起确认收款页面参数")
+ private String packageInfo;
}
--
Gitblit v1.7.1