From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java
index 8c01a3b..04371d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComOrderRefundDTO.java
@@ -18,7 +18,7 @@
@ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize = 10L;
- @ApiModelProperty(value = "订单状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)")
+ @ApiModelProperty(value = "订单状态(9.处理中 10.退款成功 11.退款失败 12.已取消 13.退款中)")
private Integer status;
@ApiModelProperty(value = "店铺id")
@@ -26,4 +26,7 @@
@ApiModelProperty(value = "用户id", hidden = true)
private Long userId;
+
+ @ApiModelProperty(value = "商家用户id", hidden = true)
+ private Long backstageUserId;
}
--
Gitblit v1.7.1