From 33a47eef5b24737a8037e52ea3e49588e7df8d52 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 11:05:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
index abc3488..7e4070c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java
@@ -37,10 +37,18 @@
private Integer status;
@ApiModelProperty("配送方式（1=自提，2=快递）")
private Integer distributionMode;
+ @ApiModelProperty("获得分佣")
+ private BigDecimal getCommission;
/**
* 用户id
*/
private Long appUserId;
@ApiModelProperty("售后订单id")
private String refundPassId;
+
+ private Integer shopId;
+
+ public BigDecimal getGetPoint(){
+ return point;
+ }
}
--
Gitblit v1.7.1