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

xiaoyong931011

2021-06-30 44400f2f3427791c5382b02d70c4c0ef8d0c49ed

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

@@ -29,7 +29,7 @@
    private BigDecimal totalPrice;
    @ApiModelProperty(value="总重")
    private BigDecimal totalWeight;
    @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
    @ApiModelProperty(value="状态 1-待接单2-已接单3-已收款(用户)/待入库(集物员)4-已完成5-已取消")
    private Integer status;
    @ApiModelProperty(value="集物员")
    private String username;