Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-18 f196447bcf0b1cdb910a47e1babad6f284c28bd2

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

@@ -78,4 +78,18 @@
    @TableField(exist = false)
    private Integer status;

    @ApiModelProperty(value = "主键字符串")
    @TableField(exist = false)
    private String idStr;

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

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



}