From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期日, 27 四月 2025 17:26:32 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou 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