From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 14:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
index d58add3..5dd9dc2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java
@@ -49,17 +49,13 @@
@TableField("num3")
private Integer num3;
- @ApiModelProperty(value = "点位类型覆盖率json {\n" +
- "\t\"num5\": [{\n" +
+ @ApiModelProperty(value = "点位类型覆盖率json [{\n" +
"\t\t\"id\": \"18678093453\",\n" +
"\t\t\"value\": 18\n" +
"\n" +
"\t}, {\n" +
"\t\t\"id\": \"18678093453\",\n" +
- "\t\t\"value\": 18\n" +
- "\t}]\n" +
- "\n" +
- "}")
+ "\t\t\"value\": 18\n" + "}]\n")
@TableField("num4")
private String num4;
@@ -67,5 +63,8 @@
@TableField("template_id")
private String templateId;
+ @ApiModelProperty(value = "当前周期值")
+ @TableField("current_value")
+ private Integer currentValue;
}
--
Gitblit v1.7.1