Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-15 112473768acb75b2f9bd7eca3da035ed624e5123

 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;