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

xiaoyong931011

2021-06-29 bd1dfc46c917596265f61fe279ed024478a6a59e

 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 accountPhone;

    @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
    private Integer status;