From a0eae3ecda7b70468c60a0079db6c4609c29939d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 09:36:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 86ff495..16a2b7e 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,7 +34,10 @@
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
-
+ @TableField("province_code")
+ private String provinceCode;
+ @TableField("are_code")
+ private String areaCode;
@ApiModelProperty("订单编号")
@TableField("order_number")
private String orderNumber;
@@ -54,6 +57,13 @@
@ApiModelProperty("回收服务id")
@TableField("serve_id")
private Integer serveId;
+
+ @ApiModelProperty("打印次数")
+ @TableField("print_count")
+ private Integer printCount;
+ @TableField("msg_count")
+ private Integer msgCount;
+
@ApiModelProperty("回收服务名称")
@TableField("serve_name")
@@ -175,5 +185,15 @@
@ApiModelProperty("是否为再投单")
@TableField("is_reinvest")
private Integer isReinvest;
-
+ @ApiModelProperty("铭牌图片(多张照片 ','隔开)")
+ @TableField("card_pic")
+ private String cardPic;
+ @ApiModelProperty("机型图片(多张照片 ','隔开)")
+ @TableField("machine_pic")
+ private String machinePic;
+ @ApiModelProperty("回收单凭证(多张照片 ','隔开)")
+ @TableField("paper_pic")
+ private String paperPic;
+ @ApiModelProperty("拉起确认收款页面参数")
+ private String packageInfo;
}
--
Gitblit v1.7.1