Merge branch 'develop'

JiangYouYao

2022-03-15 b51ab926c93ac946fb9c78cdbad74cdb90e5e7e1

 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;