From e1e93392af81a6c347d60c8eebbc8306bb074ce3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 八月 2024 18:04:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
index 1032e02..9449897 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
@@ -39,8 +39,8 @@
private Integer standardCondition;
@ApiModelProperty(value = "达标条件值JSON（{\"day\":1,\"times\":5}）")
- @TableField("condition")
- private String condition;
+ @TableField("conditions")
+ private String conditions;
@@ -49,6 +49,10 @@
@TableField(exist = false)
private Long count;
+ @ApiModelProperty(value = "前端展示用")
+ @TableField("type")
+ private Integer type;
+
}
--
Gitblit v1.7.1