From 21871f13f249ad23c09cefb945fac56f94cca790 Mon Sep 17 00:00:00 2001 From: "DESKTOP-C3M45P4\\dengdan" Date: Tue, 13 May 2025 18:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=A8=E6=9C=8D=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=8F=E5=88=97=E5=8C=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/PropertyItemDeserializer.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/dao/Equip.java | 2 +- .../main/java/com/ljsd/jieling/logic/dao/PropertyItem.java | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/PropertyItemDeserializer.java b/serverlogic/src/main/java/com/ljsd/PropertyItemDeserializer.java index 1656e3c69..b39e8a618 100644 --- a/serverlogic/src/main/java/com/ljsd/PropertyItemDeserializer.java +++ b/serverlogic/src/main/java/com/ljsd/PropertyItemDeserializer.java @@ -14,7 +14,7 @@ public class PropertyItemDeserializer implements JsonDeserializer if (type != null && type.getAsString().equals("baubles")) { return context.deserialize(json, Baubles.class); } else { - return null; + return context.deserialize(json, Baubles.class); } } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java index a442d2410..716675981 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java @@ -1,7 +1,7 @@ package com.ljsd.jieling.logic.dao; @Deprecated -public class Equip{ +public class Equip { /*private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(Equip.class); private int rebuildLevel; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PropertyItem.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PropertyItem.java index 2bfad227c..80d9b3b58 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PropertyItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PropertyItem.java @@ -9,11 +9,6 @@ import com.ljsd.jieling.util.UUIDEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -//@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") -//@JsonSubTypes({ -// @JsonSubTypes.Type(value = Baubles.class, name = "baubles") -//}) public class PropertyItem extends MongoBase { private static final Logger LOGGER = LoggerFactory.getLogger(PropertyItem.class);