Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-28 58032b964fa5dee3924847943548093af6dcb098

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SaleOrderDto.java

@@ -20,7 +20,7 @@
    private Integer  orderStatus;

    @ApiModelProperty(hidden = true)
    private String  userId;
    private Long  userId;