From 0533bbabfe22484a84c85d13a391a1fd5cb949c2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 25 七月 2023 14:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
index e52c535..ba53338 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
@@ -1,9 +1,13 @@
package com.ruoyi.app.task.domain;
+import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
/**
* app浠诲姟璇︽儏瀵硅薄 ard_app_task_detail
@@ -50,7 +54,44 @@
@Excel(name = "浠诲姟ID")
private String taskId;
- public void setId(String id)
+ /**
+ * 鐘舵�侊紙0鏈畬鎴� 1宸插畬鎴愶級
+ */
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈畬鎴�,1=宸插畬鎴�")
+ private String status;
+
+ /** 鎵撳崱鍥剧墖url */
+ @Excel(name = "鎵撳崱鍥剧墖url")
+ private String clockInPicUrl;
+
+ /** app浠诲姟璇︽儏鍥剧墖淇℃伅 */
+ private List<ArdAppTaskDetailPic> ardAppTaskDetailPic;
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getClockInPicUrl() {
+ return clockInPicUrl;
+ }
+
+ public void setClockInPicUrl(String clockInPicUrl) {
+ this.clockInPicUrl = clockInPicUrl;
+ }
+
+ public List<ArdAppTaskDetailPic> getArdAppTaskDetailPic() {
+ return ardAppTaskDetailPic;
+ }
+
+ public void setArdAppTaskDetailPic(List<ArdAppTaskDetailPic> ardAppTaskDetailPic) {
+ this.ardAppTaskDetailPic = ardAppTaskDetailPic;
+ }
+
+ public void setId(String id)
{
this.id = id;
}
--
Gitblit v1.9.3