From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java
index 01b1c37..bcfd7db 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Prize.java
@@ -39,4 +39,8 @@
@TableField("probability")
private String probability;
+ @ApiModelProperty("类型 1=补贴金 2=奖品")
+ @TableField("prize_type")
+ private Integer prizeType;
+
}
--
Gitblit v1.7.1