From f6564b610b382c6c78f0e1cb231c60ea6cf543ef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 17 六月 2025 21:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTemplateDetail.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 0cde530..3a1923f 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
@@ -29,9 +29,13 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
- @ApiModelProperty(value = "周期 单位天")
+ @ApiModelProperty(value = "周期值")
@TableField("cycle")
private Integer cycle;
+
+ @ApiModelProperty(value = "周期 单位 1=天 2=周 3=月 4=季度 5=年度")
+ @TableField("cycle_type")
+ private Integer cycleType;
@ApiModelProperty(value = "每个保洁员被抽查")
@TableField("num1")
@@ -45,7 +49,17 @@
@TableField("num3")
private Integer num3;
- @ApiModelProperty(value = "点位类型覆盖率json")
+ @ApiModelProperty(value = "点位类型覆盖率json {\n" +
+ "\t\"num5\": [{\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" +
+ "}")
@TableField("num4")
private String num4;
@@ -53,5 +67,8 @@
@TableField("template_id")
private String templateId;
+ @ApiModelProperty(value = "当前周期值")
+ @TableField("current_value")
+ private Integer currentValue;
}
--
Gitblit v1.7.1