Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-08 9dfddb73a329af5afb72c47ba0fd500962f78321

 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;