From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderDetailVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderDetailVO.java
similarity index 93%
rename from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderDetailVO.java
index 2377c61..4063627 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/vo/OrderDetailVO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.vo;
+package vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +18,7 @@
private List<OrderGoodsVO> goodsList;
@ApiModelProperty(value = "使用积分")
- private BigDecimal point;
+ private Integer point;
@ApiModelProperty(value = "收货地址id")
private Long addressId;
@@ -54,7 +54,7 @@
private BigDecimal expressAmount;
@ApiModelProperty(value = "可获得积分")
- private BigDecimal pointAmount;
+ private Integer pointAmount;
@ApiModelProperty(value = "实际支付价格")
private BigDecimal paymentAmount;
--
Gitblit v1.7.1