Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-07 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/PromotionWishList.java

@@ -72,6 +72,7 @@
    private Integer delFlag;

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

}