From 8996a395634421636347aab16458ed79614cc299 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 七月 2025 09:01:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/dao/dto/FootDataDTO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java b/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
index ed14cf8..7496a19 100644
--- a/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
+++ b/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.dto;
+import com.alibaba.fastjson.JSONArray;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,6 +15,8 @@
@ApiModelProperty(value = "foot浜岀淮鐮�")
private String footImgUrl;
+ @ApiModelProperty(value = "foot浜岀淮鐮�2")
+ private String footImgUrl2;
@ApiModelProperty(value = "foot鏂囨")
private String footWords;
@@ -31,10 +34,12 @@
private String address;
@ApiModelProperty(value = "瑙ｅ喅鏂规锛圼{\"name\":\"瑙ｅ喅鏂规涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"瑙ｅ喅鏂规浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
- private String solveScheme;
+ private JSONArray solveScheme;
@ApiModelProperty(value = "鏅烘収绯荤粺锛圼{\"name\":\"鏅烘収绯荤粺涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"鏅烘収绯荤粺浜孿",\"address\":\"璺宠浆鍦板潃浜孿"}]锛�")
- private String wisdomSystem;
+ private JSONArray wisdomSystem;
+ @ApiModelProperty(value = "鑽ｈ獕璧勮川锛圼{\"name\":\"鑽ｈ獕璧勮川涓�\",\"address\":\"璺宠浆鍦板潃涓�\"},{\"name\":\"鑽ｈ獕璧勮川浜孿",\"address\":\"鑽ｈ獕璧勮川涓塡"}]锛�")
+ private JSONArray honors;
}
--
Gitblit v1.9.3