Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-17 912d2e62391b1459952375a60ba87cfa842f1c41

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