Merge remote-tracking branch 'origin/master'

mitao

2024-06-18 f81ae4085304f74db4454e9168af75d59496bb87

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

@@ -50,7 +50,7 @@
    private OrderFromEnum orderFrom;
    
    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
    private AuctionOrderTypeEnum auctionType;
    private AuctionOrderTypeEnum auctionOrderType;

    @ApiModelProperty(value = "会员id")
    private Long memberId;