Merge branch 'score_shop'

wzy

2022-03-27 1f79de94f2fd5ff2b6de6556339aefd1c262dc40

 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;