Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 e9c394d8944d6afc40dc36336e4e93f4de1517c2

 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;