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

xiaoyong931011

2021-07-21 d25897a9e4a96079e3ef9d767083e631ead13a1c

 gc-user/src/main/java/com/xzx/gc/user/vo/OrderItemsVo.java

@@ -17,6 +17,12 @@
    @ApiModelProperty(value="订单编号")
    private String orderNo;

    @ApiModelProperty(value="团员名字")
    private String nickname;

    @ApiModelProperty(value="手机号")
    private String phone;

    @ApiModelProperty(value="回收品类")
    private List<JhyOrderItems> OrderItems;