Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtOrderVO.java

@@ -35,7 +35,7 @@
    private LocalDateTime orderTime;

    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
    private AuctionOrderTypeEnum auctionType;
    private AuctionOrderTypeEnum auctionOrderType;

    @ApiModelProperty(value = "所属拍卖场")
    private String salesroomName;
@@ -144,4 +144,8 @@

    @ApiModelProperty("物流信息")
    private Express100VO express100VO;

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

}