From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
index 40a8e0a..935aa53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java
@@ -20,6 +20,9 @@
@ApiModelProperty("社区id")
private String communityId;
+ @ApiModelProperty("分类名称")
+ private String classifyName;
+
@ApiModelProperty("分类id")
private String classifyId;
@@ -92,13 +95,16 @@
@ApiModelProperty("是否参加任务 0未参加 1参加")
private String isJoin;
+ @ApiModelProperty("服务时长 毫秒值")
+ private String serviceTime;
+
@ApiModelProperty("开始时间打卡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date punch_start_time;
+ private Date punchStartTime;
@ApiModelProperty("结束时间打卡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date punch_end_time;
+ private Date punchEndTime;
}
--
Gitblit v1.7.1