From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 20 Apr 2021 00:24:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java index b397718..b0e5aef 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java @@ -16,6 +16,8 @@ private Long id; @ApiModelProperty(value = "订单编号") private String orderNo; + @ApiModelProperty(value = "订单状态") + private Integer orderState; @ApiModelProperty(value = "实付金额(元)") private BigDecimal actualBalance; @ApiModelProperty(value = "下单门店") -- Gitblit v1.9.1