From 07d470e55405cbfab1a7d38eeeb8907e741401df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 20:13:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java | 4 ++++
1 files changed, 4 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 152ef52..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,6 +37,8 @@
private Integer status;
@ApiModelProperty("配送方式（1=自提，2=快递）")
private Integer distributionMode;
+ @ApiModelProperty("获得分佣")
+ private BigDecimal getCommission;
/**
* 用户id
*/
@@ -44,6 +46,8 @@
@ApiModelProperty("售后订单id")
private String refundPassId;
+ private Integer shopId;
+
public BigDecimal getGetPoint(){
return point;
}
--
Gitblit v1.7.1