From 26574047ac19087a7f8dc310ddc44dc24fc9b851 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 20:26:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
index a922e46..6d04291 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "实付金额")
private Double orderMoney;
+
+ @ApiModelProperty(value = "订单状态")
+ private Integer orderState;
@ApiModelProperty(value = "下单门店")
private String storeName;
--
Gitblit v1.9.1