Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-27 49c1552ab77c0aca7f1f726a89fdccb7ddd428b2

 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);