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

xiaoyong931011

2021-07-16 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c

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

@@ -36,6 +36,9 @@
    @ApiModelProperty(value="台数")
    private String recycleTai;

    @ApiModelProperty(value="KG数")
    private String recycleKg;

    @ApiModelProperty(value="类型")
    private Long itemType;
}