Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-28 0741dc7f25811ea2acb4127fc43d1dc9a802221c

 gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java

@@ -18,9 +18,12 @@
    @ApiModelProperty(value="价格")
    private BigDecimal price;

    @ApiModelProperty(value="总计")
    @ApiModelProperty(value="总计= 价格*40")
    private BigDecimal allPrice;

    @ApiModelProperty(value="总积分= 价格*重量*40")
    private BigDecimal allScore;

    @ApiModelProperty(value="图片")
    private String picture;