Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 56dd09a1c7405535ad5ec43a3f8b01001bb40611

 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;