From 56dd09a1c7405535ad5ec43a3f8b01001bb40611 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 20 Nov 2021 21:19:01 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- 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