Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-18 f6e2f4ba4093e401475398e1bd3f7c2e8165b3cb

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

@@ -82,6 +82,10 @@
    @TableField(exist = false)
    private String idStr;

    @ApiModelProperty(value = "会员名称")
    @TableField(exist = false)
    private String vipName;

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