Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java

@@ -152,4 +152,16 @@
    
    @ApiModelProperty("拍卖会id")
    private Long auctionSalesroomId;
    @ApiModelProperty("是否显示订单 1显示，2 不显示")
    private Integer isOrder;

    @ApiModelProperty("是否售后 0未售后，1 售后")
    private Integer isRequest;

    @ApiModelProperty("失效时间")
    private LocalDateTime orderTimeSx;

    @ApiModelProperty("团购编号")
    private String groupNo;

}