Merge remote-tracking branch 'origin/master'

xuhy

2024-09-02 cb63313e5e30efc4f246546c9c7f07ffeff4a0e2

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java

@@ -92,5 +92,11 @@
    @ApiModelProperty(value = "会员类型名称")
    @TableField(exist = false)
    private String name;
    @ApiModelProperty(value = "uid")
    @TableField(exist = false)
    private String uid;
    @ApiModelProperty(value = "userUid")
    @TableField(exist = false)
    private String userUid;

}