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

xiaoyong931011

2021-07-21 d25897a9e4a96079e3ef9d767083e631ead13a1c

 gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java

@@ -15,6 +15,9 @@
    @ApiModelProperty(value="联系人/手机号")
    private String account;

    @ApiModelProperty(value="集物员的名字")
    private String jwyName;

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