Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java

@@ -31,8 +31,8 @@

    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty(value = "收藏目标id")
    private Long targetId;