From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 14 Apr 2021 17:31:07 +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 | 4 ++++ 1 files changed, 4 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 d3c41d7..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,12 +16,16 @@ private Long id; @ApiModelProperty(value = "订单编号") private String orderNo; + @ApiModelProperty(value = "订单状态") + private Integer orderState; @ApiModelProperty(value = "实付金额（元）") private BigDecimal actualBalance; @ApiModelProperty(value = "下单门店") private String address; @ApiModelProperty(value = "客户") private String custom; + @ApiModelProperty(value = "客户openId") + private String customUserId; @ApiModelProperty(value = "推广员") private String parentSale; @ApiModelProperty(value = "收益类型") -- Gitblit v1.9.1