From 10f21f15dc41f33da2f6c4dbf8d7a794c6c3c80a Mon Sep 17 00:00:00 2001 From: wangff Date: Fri, 7 Nov 2025 14:05:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=A1=E5=8F=91=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BA=8F=E5=88=97=E5=8C=96=E5=92=8C=E5=8F=8D?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dto/huoma/PublishDTO.java | 2 ++ .../com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/PublishDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/PublishDTO.java index 0e41bc75f..6453c8c8c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/PublishDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/PublishDTO.java @@ -1,5 +1,6 @@ package com.cool.store.dto.huoma; +import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,6 +20,7 @@ public class PublishDTO { private String storeCode; @ApiModelProperty(name = "设备ID列表",required = true) @NotEmpty(message = "设备ID列表不能为空") + @JSONField(name = "terminals") private List deviceIdList; @ApiModelProperty("节目id") private Long programId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java index 776d2de3c..8353f65ab 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/StoreXinFaDeviceDetail.java @@ -1,12 +1,16 @@ package com.cool.store.dto.huoma; +import com.alibaba.fastjson.parser.DefaultJSONParser; +import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer; import com.cool.store.utils.BrowserVersionUtils; import com.cool.store.utils.StringUtil; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import io.swagger.annotations.Api; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.lang.reflect.Type; + /** * @Author suzhuhong * @Date 2025/8/18 16:27 @@ -20,6 +24,7 @@ public class StoreXinFaDeviceDetail { * 设备ID */ @ApiModelProperty(value = "设备ID") + @JsonProperty("id") private String deviceId; /**