From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityCommentDTO.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityCommentDTO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityCommentDTO.java
index e0e54cb..3b7fbfa 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityCommentDTO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityCommentDTO.java
@@ -1,8 +1,13 @@
package com.doumee.dao.web.dto.activity;
+import com.doumee.dao.business.model.Multifile;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
@Data
@ApiModel("鍜ㄨ锛屾帰搴楄瘎璁�")
@@ -10,6 +15,10 @@
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", example = "1")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createDate;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級", example = "1")
private Integer memberId;
@@ -50,9 +59,14 @@
@ApiModelProperty(value = "鐢ㄦ埛鏄电О" )
private String nikeName;
- @ApiModelProperty(value = "鐢ㄦ埛鏄电О" )
+ @ApiModelProperty(value = "鐢ㄦ埛澶村儚" )
private String memberImgUrl;
+ @ApiModelProperty(value = "鐐硅禐鏁�" )
+ private Integer zanCount;
+
+ @ApiModelProperty(value = "鏄惁鐐硅禐:0=鍚︼紱1=鏄紱" )
+ private Integer zanStatus;
@ApiModelProperty(value = "鍐呭绫诲瀷0鍟嗗娲诲姩 1骞冲彴娲诲姩 2鎺㈠簵 3璧勮" )
private String activityType;
@@ -66,6 +80,7 @@
@ApiModelProperty(value = "鍥炲鏁伴噺" )
private Integer replyCount;
- @ApiModelProperty(value = "鐐硅禐鏁�" )
- private Integer zanCount;
+ @ApiModelProperty(value = "闄勪欢淇℃伅" )
+ private List<Multifile> multifileList;
+
}
--
Gitblit v1.9.3