Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-03-18 f615ec5c9239327740948501627545f8e78e2a9e

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopGiveawayTemporary.java

@@ -30,8 +30,8 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableId("id")
    private Long id;

    @ApiModelProperty(value = "门店id")
    @TableField("shop_id")