Merge remote-tracking branch 'origin/master'

mitao

2024-05-29 b19813f4f558c350b2c6e8fcb821080b0c10b257

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

@@ -34,7 +34,7 @@
public class AuctionSalesroom implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "拍卖场id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;