From 7a74745bad7ff20df9e170433c1e1cb851ce7fa9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 09:17:00 +0800
Subject: [PATCH] Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
index ac68377..199316f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyAwardVo.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "奖品来源")
private String giftFrom;
- @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物")
+ @ApiModelProperty(value = "礼物类型1优惠券2商品3现金4实物5积分")
private Integer giftType;
@ApiModelProperty(value = "奖品名称")
--
Gitblit v1.7.1