From 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 11:24:30 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
index 4e27a57..cfaf04e 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
@@ -15,14 +15,11 @@
@ApiModelProperty(value="标题")
private String title;
- @ApiModelProperty(value="价格（元）")
+ @ApiModelProperty(value="单价（积分）= 价格*40")
private BigDecimal price;
- @ApiModelProperty(value="单价（积分）= 价格*40")
- private BigDecimal allPrice;
-
@ApiModelProperty(value="总积分= 价格*重量*40")
- private BigDecimal allScore;
+ private BigDecimal allPrice;
@ApiModelProperty(value="图片")
private String picture;
@@ -36,6 +33,12 @@
@ApiModelProperty(value="积分")
private String score;
+ @ApiModelProperty(value="台数")
+ private String recycleTai;
+
+ @ApiModelProperty(value="KG数")
+ private String recycleKg;
+
@ApiModelProperty(value="类型")
private Long itemType;
}
--
Gitblit v1.9.1