Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 e84eea43fa967fdb9cebc2a1146d32d5cc1d09ef

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

@@ -50,6 +50,10 @@
    @ApiModelProperty(value = "会员等级")
    private String vipName;

    @TableField(exist = false)
    @ApiModelProperty(value = "会员id")
    private Integer vipId;


    public String getIdStr() {
        return String.valueOf(id);