From f2f07f9c707dc4793c42c90c4039b41a59c3d0f2 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 26 六月 2023 19:51:23 +0800 Subject: [PATCH] 商户端和管理台联调bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java index 59694ca..f4ac294 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java @@ -26,7 +26,7 @@ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成") private Integer orderStatus; - @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建") + @ApiModelProperty("订单来源1.商城订单2.秒杀活动3.线下创建") private Integer orderFrom; @ApiModelProperty("订单商品列表") @@ -50,4 +50,7 @@ @ApiModelProperty(value = "是否绑定商户0否1是") private Integer sameShop; + @ApiModelProperty(value = "核销码") + private String verifyCode; + } -- Gitblit v1.7.1