From ccf8413a33e85589d0ed219bd1a0aff88e6a1e39 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 14:48:58 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 5c1ebb8..1478a9f 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,10 +15,10 @@
@ApiModelProperty(value="标题")
private String title;
- @ApiModelProperty(value="单价（积分）= 价格*40")
+ @ApiModelProperty(value="单价（积分）= 价格*50")
private BigDecimal price;
- @ApiModelProperty(value="总积分= 价格*重量*40")
+ @ApiModelProperty(value="总积分= 价格*重量*50")
private BigDecimal allPrice;
@ApiModelProperty(value="图片")
@@ -33,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