From d34b3987a7c89c29a74eb7d3525b2a486eeaca10 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 08 一月 2025 17:17:55 +0800
Subject: [PATCH] Merge branch 'master' 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 |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 bd2a01d..f34f85f 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;
@@ -55,6 +58,13 @@
     @TableField("serve_id")
     private Integer serveId;
 
+    @ApiModelProperty("打印次数")
+    @TableField("print_count")
+    private Integer printCount;
+    @TableField("msg_count")
+    private Integer msgCount;
+
+
     @ApiModelProperty("回收服务名称")
     @TableField("serve_name")
     private String serveName;

--
Gitblit v1.7.1