Merge branch 'refs/heads/master' into xin

xin

2025-09-17 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba

 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;
}