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

xiaoyong931011

2021-07-16 cf8e5b5cc0f781a44d66d0c8d361fec049fd4008

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

@@ -39,7 +39,7 @@
    @ApiModelProperty(value="备注")
    private String remark;

    @ApiModelProperty(value="备注")
    @ApiModelProperty(value="回收类型")
    private List<JhyOrderItemsVo> jhyOrderItemsVos;

}