Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 578e37543a5f552a3a8b071aa637cd27e68fad33

 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;