Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderAddressSnapshotQueryCriteria.java

@@ -16,6 +16,6 @@
    @ApiModelProperty(value = "每页数据量", example = "10")
    private Integer size = 10;

    @ApiModelProperty(value = "订单ID")
    private Long orderId;
    @ApiModelProperty(value = "订单号")
    private String orderNum;
}