Merge branch 'dev' into 'mp-server-test'

商品回收折扣

See merge request quanshu/mp-server!568

mp-service/src/main/java/com/qs/mp/admin/domain/vo/GoodsVO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.common.enums.GoodsStatusEnum;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -81,6 +82,9 @@ public class GoodsVO {
 	@ApiModelProperty("商品成本")
 	private Integer cost;
 
+	@ApiModelProperty("回收折扣")
+	private BigDecimal discountRate;
+
 	/**
 	 * 库存数量
 	 */