diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundCancelInterceptVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundCancelInterceptVO.java index 7665da6da..88ef2e39e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundCancelInterceptVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundCancelInterceptVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import javax.validation.constraints.NotNull; @Data @ApiModel @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdminAdRoundCancelInterceptVO { @NotNull(message = "推广轮次ID不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java index da723062f..f7650bb7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundSysInterceptVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +18,7 @@ import java.util.List; @Data @ApiModel @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdminAdRoundSysInterceptVO { @NotNull(message = "推广轮次ID不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java index 35e01fe1e..529ca6bcf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.advertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import javax.validation.constraints.NotNull; @ApiModel("获取该推广位最新的购买价格及设置的商品") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdRoundLatestVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java index 783a2fbc9..a494046ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.advertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.math.BigDecimal; @ApiModel("档口购买推广营销位") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdRoundStoreCreateVO { @NotNull(message = "广告ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java index eef1b52c2..c50a09dd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.advertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.math.BigDecimal; @ApiModel("档口上传推广图 或 修改商品") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdRoundUpdateVO { @NotNull(message = "推广轮次ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java index 688dc5245..84a4f3a54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.feedback; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.xss.Xss; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +16,7 @@ import javax.validation.constraints.Size; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class FeedbackVO { @ApiModelProperty(value = "用户反馈内容", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/QuickFuncVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/QuickFuncVO.java index 85d4cd807..a35f0e921 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/QuickFuncVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/QuickFuncVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.quickFunction; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; @@ -16,7 +15,7 @@ import java.util.List; @ApiModel @Data @Builder -@JsonInclude(JsonInclude.Include.NON_NULL) + @NoArgsConstructor @AllArgsConstructor public class QuickFuncVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/StoreQuickFuncVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/StoreQuickFuncVO.java index 75e4972d9..904781894 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/StoreQuickFuncVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/quickFunction/StoreQuickFuncVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.quickFunction; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -16,7 +15,7 @@ import lombok.NoArgsConstructor; @ApiModel("档口快捷功能") @Data @Builder -@JsonInclude(JsonInclude.Include.NON_NULL) + @NoArgsConstructor @AllArgsConstructor public class StoreQuickFuncVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java index 411e903a3..becfe2783 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.store; -import com.ruoyi.xkt.dto.store.StoreAppResDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java index 2e2d4f602..3ebe4e935 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("档口客户批量删除") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdBatchDiscountDeleteVO { @NotNull(message = "ID列表不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountVO.java index e0baa9e30..416110493 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel("档口客户批量减价、批量抹零") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdBatchDiscountVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscExistVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscExistVO.java index 389222253..45e355b09 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscExistVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscExistVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel("档口是否已存在该商品的优惠") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscExistVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java index df41eb7a8..58c36a49b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdDiscountVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel(value = "新增或修改档口客户优惠") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscountVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusGeneralSaleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusGeneralSaleVO.java index 1816209f0..2624b0843 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusGeneralSaleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusGeneralSaleVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCustomer; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.math.BigDecimal; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusGeneralSaleVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java index c41d8cdf9..74364aa6c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeCustomer; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import javax.validation.constraints.Pattern; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryResVO.java index 7013ad316..19d4b09de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryResVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeFactory; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +15,7 @@ import java.util.Date; */ @ApiModel("档口合作工厂数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreFactoryResVO { @ApiModelProperty(value = "档口工厂ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryVO.java index 8337da8b8..511d5e4bc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeFactory; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreFactoryVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java index 0174b9a85..837bc33ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeDecorationVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java index 6934654d7..1de82644a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeProdResVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeHomepage; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.util.List; */ @ApiModel("档口首页返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeProdResVO { @ApiModelProperty(value = "档口基本信息") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreRecommendResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreRecommendResVO.java index 630fd94e0..b03073953 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreRecommendResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreRecommendResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("档口推荐商品列表") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRecommendResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java index 591fdb30b..862096104 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.storeColor.StoreColorVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,7 +23,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdCreateVO { @ApiModelProperty(value = "档口商品名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCountResVO.java index a526b4832..732dd5bb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCountResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStatusCountResVO { @ApiModelProperty(value = "未发布数量") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java index 9bbc218be..54264a6bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdUpdateVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.storeColor.StoreColorVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,7 +23,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdUpdateVO { @ApiModelProperty(value = "档口商品名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java index 80fe17fd6..592ba3716 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.storeColor.StoreColorVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,7 +23,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdVO { @ApiModelProperty(value = "档口商品名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnResVO.java index 64182ec90..2b7c919e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "打印条码返回前端数据model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StorePrintSnResVO { @ApiModelProperty(value = "档口商品颜色ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnVO.java index ccc1680be..e12ac2156 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StorePrintSnVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @Data @ApiModel(value = "打印条码请求入参") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StorePrintSnVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java index 944a50f70..70a3be01f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.math.BigDecimal; */ @Data @ApiModel(value = "档口销售扫码返回数据") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleSnResVO { @ApiModelProperty(value = "是否成功") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnVO.java index 3d50e814f..e21159fb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreSaleSnVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel(value = "档口销售条码查询model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleSnVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnResVO.java index 20b7ed44b..a918c8411 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "档口库存返回数据") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStockTakingSnResVO { @ApiModelProperty(value = "错误列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnVO.java index 284ea34fc..718ebc865 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStockTakingSnVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel(value = "库存条码查询model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStockTakingSnVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnResVO.java index 2de16bdb4..128b2c8cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; @Data @ApiModel(value = "档口入库扫码返回数据") @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageSnResVO { @ApiModelProperty(value = "错误列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnVO.java index 6a21ecfa7..76bb8b355 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorSize/StoreStorageSnVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel(value = "入库条码查询model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageSnVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdCheckStockVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdCheckStockVO.java index 0c4ce3fb7..4f6a3934b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdCheckStockVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdCheckStockVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @ApiModel("档口商品盘点提交") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdCheckStockVO { @NotNull(message = "档口商品颜色的库存不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountVO.java index c6c1dac6b..d7ccd9ccd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import javax.validation.constraints.NotNull; */ @ApiModel("档口商品颜色的库存及客户的优惠信息") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockAndDiscountVO { @NotNull(message = "档口商品颜色ID不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockExportVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockExportVO.java index c37bb60d0..a9c54ce12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockExportVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockExportVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockExportVO { @NotNull(message = "storeId不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java index ccf269e91..74dc7a6c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockVO { @NotNull(message = "档口商品库存ID不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageResVO.java index 0417586f8..68d636e4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageResVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStorage; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,7 +18,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class StoreProdStorageResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageVO.java index c89a6a68b..03bd86313 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreProdStorageVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStorage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +19,7 @@ import java.util.List; */ @ApiModel(value = "新增商品入库") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStorageVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreStorageExportVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreStorageExportVO.java index d975722bd..8fd4ba24f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreStorageExportVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStorage/StoreStorageExportVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStorage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageExportVO { @NotNull(message = "storeId不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java index b1f14f844..06605e857 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandExportVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdDemandExportVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandStatusCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandStatusCountResVO.java index ea238c523..eeeda2c5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandStatusCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandStatusCountResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdDemandStatusCountResVO { @ApiModelProperty(value = "待生产数量") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleUpdateStatusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleUpdateStatusVO.java index afddc1cca..55cc1ad14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleUpdateStatusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleUpdateStatusVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeRole; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleUpdateStatusVO { @ApiModelProperty(value = "档口子角色ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleVO.java index 3049d3858..144777f99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeRole; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel("档口子角色") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateStatusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateStatusVO.java index 5abab2e96..51c960ec3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateStatusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateStatusVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccUpdateStatusVO { @ApiModelProperty(value = "档口子账号ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateVO.java index 1ecfc4275..577c4c7b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccUpdateVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.Size; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccUpdateVO { @ApiModelProperty(value = "档口子账号ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccVO.java index d775ccc33..12480f859 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import javax.validation.constraints.Size; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleExportVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleExportVO.java index 38926d4f6..06fa904f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleExportVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleExportVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel(value = "导出销售出库") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleExportVO { @NotNull(message = "storeId不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePayStatusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePayStatusVO.java index bb7129361..2b16bde17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePayStatusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePayStatusVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("档口商品销售客户欠款结算") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSalePayStatusVO { @ApiModelProperty(value = "结算的storeSaleId列表", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java index f5fcac787..a29aaad8f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleResVO { @ApiModelProperty(value = "是否为返单:true 是返单 false 不是返单") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleUpdateMemoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleUpdateMemoVO.java index f4cb4a707..70544bb67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleUpdateMemoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleUpdateMemoVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import javax.validation.constraints.Size; */ @ApiModel("档口销售修改备注") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleUpdateMemoVO { @NotNull(message = "storeSaleId不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java index aa651c703..1589e6f41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.util.List; */ @ApiModel(value = "新增或编辑销售出库") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleVO { @NotNull(message = "是否为返单不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreTodaySaleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreTodaySaleVO.java index afff44efd..fb5d83b99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreTodaySaleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreTodaySaleVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.math.BigDecimal; */ @ApiModel("档口今日销售数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreTodaySaleVO { @ApiModelProperty(value = "storeId") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java index ad257654a..bbd3577f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSaleRefundRecord/StoreSaleRefundRecordVO.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeSaleRefundRecord; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.util.Date; @ApiModel("档口商品销售返单数据") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleRefundRecordVO { @ApiModelProperty("返单ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java index b2559798e..264745db4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthCreateVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userAuthentication; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.math.BigDecimal; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserAuthCreateVO { @NotBlank(message = "真实名称不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthResVO.java index 5c514181f..f0447aaba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userAuthentication; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserAuthResVO { @ApiModelProperty(value = "代发ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchAddToShopCartVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchAddToShopCartVO.java index a73a6508d..8ee309766 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchAddToShopCartVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchAddToShopCartVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel("电商卖家新增商品收藏") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavBatchAddToShopCartVO { @Valid diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchDeleteVO.java index b73ca0904..014de59a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavBatchDeleteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("电商卖家取消商品收藏") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavBatchDeleteVO { @NotNull(message = "档口商品ID列表不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteDeleteVO.java index 279c5d99e..7eed1f0e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteDeleteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("用户删除收藏商品") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoriteDeleteVO { @NotNull(message = "用户收藏ID列表不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoritePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoritePageVO.java index 162296bdb..05a2a0351 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoritePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoritePageVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.BasePageVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,7 +17,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoritePageVO extends BasePageVO { @NotNull(message = "商品状态不可为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteVO.java index b394bd430..468220974 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userFavorite/UserFavoriteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoriteVO { @ApiModelProperty("用户新增收藏列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartDeleteVO.java index f55fef27a..412192db6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartDeleteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("进货车删除") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartDeleteVO { @NotNull(message = "进货车ID列表不可为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java index 223aed921..a48740546 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditDetailResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartEditDetailResVO { @ApiModelProperty("档口商品ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditVO.java index 65af62a20..643600332 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartEditVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartEditVO { @ApiModelProperty(value = "进货车ID, 新增不传，编辑必传", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartListVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartListVO.java index d8398f1c6..bad4abf09 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartListVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartListVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("电商卖家进货车下单") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartListVO { @NotNull(message = "档口商品ID列表不可为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartPageVO.java index 28474d901..5205ee864 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartPageVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.BasePageVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,7 +17,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @ApiModel("电商卖家进货车列表") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartPageVO extends BasePageVO { @NotNull(message = "商品状态不可为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java index 66e818cfc..1300ec894 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @ApiModel("电商卖家进货车数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartStatusCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartStatusCountResVO.java index 13ab95b05..6ea594b33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartStatusCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartStatusCountResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartStatusCountResVO { @ApiModelProperty(value = "在售数量") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java index b2233e999..3e6246f0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartToOrderResVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @ApiModel("档口商品详情返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartToOrderResVO { @ApiModelProperty("档口商品ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartVO.java index 2b676c664..abc2f3cf7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; */ @ApiModel("电商卖家新增进货车") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscDeleteVO.java index de3f95a77..b4c06ea68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscDeleteVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("电商卖家取消店铺关注") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscDeleteVO { @NotNull(message = "档口ID列表不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java index 8fea6c161..d32f1d1e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscPageVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.web.controller.xkt.vo.BasePageVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +16,7 @@ import javax.validation.constraints.NotNull; @EqualsAndHashCode(callSuper = true) @ApiModel("用户关注档口列表查询入参") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscPageVO extends BasePageVO { @ApiModelProperty(value = "档口名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscVO.java index eab60bbd0..c2a1bc9ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userSubscriptions/UserSubscVO.java @@ -1,6 +1,5 @@ package com.ruoyi.web.controller.xkt.vo.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import javax.validation.constraints.NotNull; */ @ApiModel("电商卖家店铺关注") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscVO { @NotNull(message = "档口ID不能为空!") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundCancelInterceptDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundCancelInterceptDTO.java index ef5103a7a..8b4096f1a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundCancelInterceptDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundCancelInterceptDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.adminAdvertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdminAdRoundCancelInterceptDTO { @ApiModelProperty(value = "推广轮次ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java index b3f857778..307923d68 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundPageResDTO.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java index 0461dc6b4..77ee64273 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/adminAdvertRound/AdminAdRoundSysInterceptDTO.java @@ -1,13 +1,10 @@ package com.ruoyi.xkt.dto.adminAdvertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -19,7 +16,7 @@ import java.util.List; @ApiModel("系统拦截档口推广位") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdminAdRoundSysInterceptDTO { @ApiModelProperty(value = "推广轮次ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundLatestDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundLatestDTO.java index 71c685f87..44643d738 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundLatestDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundLatestDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import lombok.experimental.Accessors; @ApiModel("获取该推广位最新的购买价格及设置的商品") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdRoundLatestDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreCreateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreCreateDTO.java index 378f675e6..a0e67eac4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreCreateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreCreateDTO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundUpdateDTO.java index b845fab7a..c14772052 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundUpdateDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.math.BigDecimal; @ApiModel("档口上传推广图 或 修改商品") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class AdRoundUpdateDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/category/APPCateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/category/APPCateDTO.java index 10f2b1ad6..6c983d1d7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/category/APPCateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/category/APPCateDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.category; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.math.BigDecimal; @ApiModel("APP分类页") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPCateDTO { @ApiModelProperty(value = "1推广图") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexHotSaleRightFixDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexHotSaleRightFixDTO.java index b72168f9f..2bc96f805 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexHotSaleRightFixDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexHotSaleRightFixDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.index; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.math.BigDecimal; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPIndexHotSaleRightFixDTO { @ApiModelProperty(value = "2商品") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexMidBrandDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexMidBrandDTO.java index 598a8a840..32b0bf9be 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexMidBrandDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexMidBrandDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.index; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.math.BigDecimal; @ApiModel("APP首页品牌好货") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPIndexMidBrandDTO { @ApiModelProperty(value = "2商品") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexTopBannerDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexTopBannerDTO.java index 11a7dc045..3a2106091 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexTopBannerDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPIndexTopBannerDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.index; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.math.BigDecimal; */ @ApiModel("APP 首页顶部轮播图") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class APPIndexTopBannerDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPSearchDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPSearchDTO.java index d6adcac5b..5fe68c12d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPSearchDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/index/APPSearchDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.index; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; @ApiModel("APP 搜索 列表") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPSearchDTO { @ApiModelProperty(value = "会员等级") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java index 30d1a1bef..cf144797f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/own/APPOwnGuessLikeDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.own; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +16,7 @@ import java.util.List; @ApiModel("APP我的猜你喜欢列表") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPOwnGuessLikeDTO { @ApiModelProperty(value = "会员等级") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateSubDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateSubDTO.java index 5d9460089..ba9c90309 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateSubDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateSubDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.prod; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPProdCateSubDTO { @ApiModelProperty(value = "会员等级") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateTop3DTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateTop3DTO.java index 74218664c..48f0a5438 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateTop3DTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdCateTop3DTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.prod; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPProdCateTop3DTO { @ApiModelProperty(value = "档口商品分类ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdSaleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdSaleDTO.java index 1003119c2..755aeec8e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdSaleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/prod/APPProdSaleDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.prod; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthProdDTO.java index bcdee1d63..01dd4e1f2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthProdDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.strength; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,6 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class APPStrengthProdDTO { @ApiModelProperty(value = "会员等级") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreDTO.java index 592e36269..cd09f90d5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.strength; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +11,6 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) public class APPStrengthStoreDTO { @ApiModelProperty(value = "会员等级") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreFileDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreFileDTO.java index cf4b5ccac..d6bf1d7f4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreFileDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/app/strength/APPStrengthStoreFileDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.advertRound.app.strength; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class APPStrengthStoreFileDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/CateSaleRankDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/CateSaleRankDTO.java index 41f8a6899..c6f954c31 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/CateSaleRankDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/CateSaleRankDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.dailySale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +12,7 @@ import lombok.experimental.Accessors; */ @ApiModel("首页销售榜数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class CateSaleRankDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/StoreTodaySaleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/StoreTodaySaleDTO.java index 9c8e9ddcf..bf57d3a31 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/StoreTodaySaleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/dailySale/StoreTodaySaleDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.dailySale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.math.BigDecimal; */ @ApiModel("档口今日销售数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class StoreTodaySaleDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackDTO.java index faa4b8d6a..9e871119a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.feedback; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -@JsonInclude(JsonInclude.Include.NON_NULL) + public class FeedbackDTO { @ApiModelProperty(value = "用户反馈内容") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java index 2d444f44e..ded527515 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/finance/AlipayReqDTO.java @@ -45,7 +45,7 @@ public class AlipayReqDTO { private String timeExpire; /** * https://opendocs.alipay.com/open/common/wifww7 - * + *

* 余额 balance * 余额宝 moneyFund * 网银 bankPay diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java index 9f728c997..4b51da18e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.order; -import com.ruoyi.xkt.dto.express.ExpressTrackDTO; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/quickFunction/QuickFuncDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/quickFunction/QuickFuncDTO.java index f61bafc87..f1c209264 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/quickFunction/QuickFuncDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/quickFunction/QuickFuncDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.quickFunction; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("档口快捷功能") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class QuickFuncDTO { @ApiModelProperty(value = "bizId 根据roleId确定，为storeId或者userId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleRevenueResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleRevenueResDTO.java index 27be47c8e..4e288e841 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleRevenueResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreIndexSaleRevenueResDTO.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.Date; /** * @author liujiang diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreOverviewDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreOverviewDTO.java index 097f0fc17..6cd98556e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreOverviewDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreOverviewDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.store; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDTO.java index a5dbe67b8..864d3fdd6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +12,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdBatchDiscountDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java index 2b951fe2e..b0ff081a4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("档口客户批量删除") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdBatchDiscountDeleteDTO { @ApiModelProperty(value = "ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistDTO.java index 45b48a9e4..048dec31c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscExistDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistResDTO.java index 5963c9b77..07e7ef778 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscExistResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口客户批量减价、批量抹零") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscExistResDTO { @ApiModelProperty(value = "档口客户名称") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscPageResDTO.java index 42117ada8..cc2521be7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscPageResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscPageResDTO { @ApiModelProperty(value = "档口客户商品优惠ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java index 9d604e94d..b373cdb16 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdDiscountDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCusProdDiscount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import javax.validation.constraints.NotNull; */ @ApiModel("档口客户优惠") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusProdDiscountDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java index 688f394be..a6e5c5bbe 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCustomer; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口客户") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusGeneralSaleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusGeneralSaleDTO.java index 3f6f0a017..77394892d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusGeneralSaleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusGeneralSaleDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeCustomer; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; @@ -18,7 +17,7 @@ import java.math.BigDecimal; @Data @Builder @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusGeneralSaleDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java index 8df98a2e8..b753e0a59 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCustomer/StoreCusPageResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeCustomer; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreCusPageResDTO { @ApiModelProperty(value = "档口客户ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryDTO.java index 4b3586768..b713e305f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeFactory; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +9,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreFactoryDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryResDTO.java index 14e666aeb..46c456d40 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeFactory/StoreFactoryResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeFactory; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreFactoryResDTO { @ApiModelProperty(value = "档口工厂ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java index 4ab5702c1..b396ff733 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java @@ -1,11 +1,9 @@ package com.ruoyi.xkt.dto.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -16,7 +14,7 @@ import java.util.List; */ @ApiModel("档口首页装修") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeDecorationDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationResDTO.java index 1e17c9289..530cbe6b7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationResDTO.java @@ -1,12 +1,10 @@ package com.ruoyi.xkt.dto.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import java.math.BigDecimal; import java.util.List; /** @@ -16,7 +14,7 @@ import java.util.List; */ @ApiModel("档口首页装修") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeDecorationResDTO { @ApiModelProperty(value = "档口首页装修模板Num") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java index 529b09770..cafe45d58 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeProdResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeHomepage; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; import com.ruoyi.xkt.dto.storeProdDetail.StoreProdDetailDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdStatusCountDTO; @@ -21,7 +20,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeProdResDTO { @ApiModelProperty(value = "档口基本信息") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeResDTO.java index 812415fe8..98395e629 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.storeProduct.StoreProdStatusCountDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,7 +13,7 @@ import lombok.experimental.Accessors; */ @ApiModel("档口首页返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreHomeResDTO { @ApiModelProperty(value = "档口基本信息") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreRecommendResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreRecommendResDTO.java index dea65b002..a0f54d958 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreRecommendResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreRecommendResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeHomepage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @ApiModel("档口推荐商品列表") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class StoreRecommendResDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnDTO.java index e1fde6da9..d9ea5d3bd 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @ApiModel(value = "打印条码请求入参") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StorePrintSnDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnResDTO.java index 62b3683c3..06b60ed79 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StorePrintSnResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "打印条码返回前端数据model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StorePrintSnResDTO { @ApiModelProperty(value = "档口商品颜色ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreProdSnDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreProdSnDTO.java index 7711c61a3..7de8367e4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreProdSnDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreProdSnDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdSnDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnDTO.java index b5df5f23f..7047fd3bb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreSaleSnDTO.java @@ -1,18 +1,15 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - /** * @author liujiang * @version v1.0 * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleSnDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnDTO.java index b859026fe..c8540bd28 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnDTO.java @@ -1,11 +1,9 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** @@ -15,7 +13,7 @@ import java.util.List; */ @Data @ApiModel(value = "库存条码查询model") -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStockTakingSnDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnResDTO.java index ef83d1b12..a37dd88db 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStockTakingSnResDTO { @ApiModelProperty(value = "错误列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnTempDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnTempDTO.java index 80caf5964..f949886e8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnTempDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStockTakingSnTempDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStockTakingSnTempDTO { @ApiModelProperty(value = "错误列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnDTO.java index 6aca573c1..a038fec38 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageSnDTO { @ApiModelProperty(value = "错误列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnResDTO.java index 43986ac4b..1a80b3a39 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColorSize/StoreStorageSnResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdColorSize; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageSnResDTO { @ApiModelProperty(value = "错误列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageDTO.java index befb49c74..81bd0d92d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdStorage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStorageDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageResDTO.java index 9808e6631..6e04a1c65 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreProdStorageResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeProdStorage; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,7 +17,7 @@ import java.util.List; */ @ApiModel("档口商品入库详情") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class StoreProdStorageResDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java index e8a165401..6c3c8e215 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageDetailDownloadDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdStorage; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.Date; */ @ApiModel("档口入库导出数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageDetailDownloadDTO { @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageExportDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageExportDTO.java index c945d06cd..59e8a34e8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageExportDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdStorage/StoreStorageExportDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProdStorage; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @ApiModel("档口入库导出数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreStorageExportDTO { @ApiModelProperty(value = "storeId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java index 7fa01973b..312be52b5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeProduct; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; import com.ruoyi.xkt.dto.storeProdSvc.StoreProdSvcDTO; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileResDTO; import io.swagger.annotations.ApiModel; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdCreateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdCreateDTO.java index 5769e99a3..44b15f410 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdCreateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdCreateDTO.java @@ -1,24 +1,6 @@ package com.ruoyi.xkt.dto.storeProduct; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.xkt.dto.storeColor.StoreColorDTO; -import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; -import com.ruoyi.xkt.dto.storeProdProcess.StoreProdProcessDTO; -import com.ruoyi.xkt.dto.storeProdSvc.StoreProdSvcDTO; -import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileDTO; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; /** * @author liujiang @@ -26,9 +8,8 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdCreateDTO { - } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java index 2c9e4fd9a..804eee152 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java @@ -3,9 +3,6 @@ package com.ruoyi.xkt.dto.storeProduct; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.xkt.dto.storeColor.StoreColorDTO; import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; -import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorDTO; -import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceSimpleDTO; -import com.ruoyi.xkt.dto.storeProdColorSize.StoreProdColorSizeDTO; import com.ruoyi.xkt.dto.storeProdProcess.StoreProdProcessDTO; import com.ruoyi.xkt.dto.storeProdSvc.StoreProdSvcDTO; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileDTO; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java index b2d506c98..ce24792b1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageResDTO.java @@ -8,7 +8,6 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** * @author liujiang diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java index 8a9c9fdd2..b4323e927 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java @@ -5,7 +5,6 @@ import com.ruoyi.xkt.dto.storeColor.StoreColorDTO; import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceSimpleDTO; -import com.ruoyi.xkt.dto.storeProdColorSize.StoreProdColorSizeDTO; import com.ruoyi.xkt.dto.storeProdColorSize.StoreProdSizeDTO; import com.ruoyi.xkt.dto.storeProdProcess.StoreProdProcessDTO; import com.ruoyi.xkt.dto.storeProdSvc.StoreProdSvcDTO; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCateCountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCateCountDTO.java index 9791bdab5..493c02d7a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCateCountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCateCountDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProduct; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口商品各个状态下分类数量") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStatusCateCountDTO { @ApiModelProperty(value = "商品状态") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountDTO.java index 1c3d697ed..a7d0366d2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProduct; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +9,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStatusCountDTO { @ApiModelProperty(value = "在售数量") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountResDTO.java index 2859ef300..74f68b9ea 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusCountResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProduct; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口商品各个状态数量") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStatusCountResDTO { @ApiModelProperty(value = "未发布数量") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusDTO.java index 4b508ae9b..5035a86b2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdStatusDTO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java index 0481b71a4..7debe9993 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdUpdateDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeProduct; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.storeColor.StoreColorDTO; import com.ruoyi.xkt.dto.storeProdCateAttr.StoreProdCateAttrDTO; import com.ruoyi.xkt.dto.storeProdProcess.StoreProdProcessDTO; @@ -26,7 +25,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdUpdateDTO { @ApiModelProperty(value = "档口商品名称") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java index 793487c65..59a5d5f61 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java index c658f8ca1..87ccee6d6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductDemand; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.annotation.Excel; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +11,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdDemandDownloadDTO { @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java index a2b987ce7..a43e1b01e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandExportDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductDemand; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdDemandExportDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandFinishAllDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandFinishAllDTO.java index 7a35e6844..bba5992ee 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandFinishAllDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandFinishAllDTO.java @@ -3,7 +3,6 @@ package com.ruoyi.xkt.dto.storeProductDemand; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java index 6c6e67e08..01772281a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeProductDemand; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandStatusCountResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandStatusCountResDTO.java index 9c6a49433..2e803f3b3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandStatusCountResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandStatusCountResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductDemand; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +9,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdDemandStatusCountResDTO { @ApiModelProperty(value = "待生产数量") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandWorkingDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandWorkingDTO.java index 4eb078feb..409553b60 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandWorkingDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandWorkingDTO.java @@ -3,7 +3,6 @@ package com.ruoyi.xkt.dto.storeProductDemand; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.util.List; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdCheckStockDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdCheckStockDTO.java index 826b2f203..6be84a6a3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdCheckStockDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdCheckStockDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("档口商品盘点提交") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdCheckStockDTO { @ApiModelProperty(value = "档口商品颜色的库存") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockAndDiscountDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockAndDiscountDTO.java index 603b4d6c6..ebeb440fc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockAndDiscountDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockAndDiscountDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口商品颜色的库存及客户的优惠信息") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockAndDiscountDTO { @ApiModelProperty(value = "档口商品颜色ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java index b9f0da627..314cf3802 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockDownloadDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductStock; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("库存明细导出") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockDownloadDTO { @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, needMerge = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockExportDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockExportDTO.java index 2026416d6..5fa1fda88 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockExportDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockExportDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeProductStock; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("档口库存导出数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreProdStockExportDTO { @ApiModelProperty(value = "storeId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleDTO.java index 70ef7302d..f0ba366ed 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeRole; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,7 +13,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleUpdateStatusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleUpdateStatusDTO.java index 6aba6a748..5acf9ebd8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleUpdateStatusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRole/StoreRoleUpdateStatusDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeRole; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口子角色停用启用") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleUpdateStatusDTO { @ApiModelProperty(value = "档口子角色ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccDTO.java index 9f77f65f0..fec875364 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import lombok.Data; */ @ApiModel("档口子账号") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccDTO { @ApiModelProperty(value = "档口子账号ID，新增为空 编辑必传") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateDTO.java index cb66542bb..abb0cd055 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +9,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccUpdateDTO { @ApiModelProperty(value = "档口子账号ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateStatusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateStatusDTO.java index 6c9cda355..48c4c98f8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateStatusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeRoleAccount/StoreRoleAccUpdateStatusDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeRoleAccount; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import javax.validation.constraints.NotNull; */ @ApiModel("档口子账号停用启用") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreRoleAccUpdateStatusDTO { @ApiModelProperty(value = "档口子账号ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java index b7e64aa88..107167118 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java @@ -1,10 +1,8 @@ package com.ruoyi.xkt.dto.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -14,7 +12,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleDTO { @ApiModelProperty(value = "是否为返单", notes = "true 是返单 false 不是返单") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java index 8abcc1a46..02e5aeb17 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDownloadDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.Date; */ @ApiModel("档口销售导出数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleDownloadDTO { @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleExportDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleExportDTO.java index d76449da3..0c92a75be 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleExportDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleExportDTO.java @@ -1,7 +1,5 @@ package com.ruoyi.xkt.dto.storeSale; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ import java.util.List; */ @ApiModel("档口销售导出数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleExportDTO { @ApiModelProperty(value = "storeId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSalePayStatusDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSalePayStatusDTO.java index 3a5b4efa5..a0e7061ae 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSalePayStatusDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSalePayStatusDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSalePayStatusDTO { @ApiModelProperty(value = "结算的storeSaleId列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java index c977b76bc..49c5402f1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeSale; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -16,7 +15,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleResDTO { @ApiModelProperty(value = "是否为返单:true 是返单 false 不是返单") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleUpdateMemoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleUpdateMemoDTO.java index c87a21aa4..c91f0a892 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleUpdateMemoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleUpdateMemoDTO.java @@ -1,12 +1,9 @@ package com.ruoyi.xkt.dto.storeSale; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Size; - /** * @author liujiang * @version v1.0 @@ -14,7 +11,7 @@ import javax.validation.constraints.Size; */ @ApiModel("档口销售修改备注") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleUpdateMemoDTO { @ApiModelProperty(value = "storeSaleId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java index f27464648..ba31a40b8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSaleRefundRecord/StoreSaleRefundRecordDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.storeSaleRefundRecord; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -16,7 +15,7 @@ import java.util.Date; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class StoreSaleRefundRecordDTO { @ApiModelProperty("返单ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/useSearchHistory/UserSearchHistoryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/useSearchHistory/UserSearchHistoryDTO.java index ea696f422..57e3d6644 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/useSearchHistory/UserSearchHistoryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/useSearchHistory/UserSearchHistoryDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.useSearchHistory; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.Date; @ApiModel("用户搜索记录") @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSearchHistoryDTO { @ApiModelProperty(value = "用户搜索ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthCreateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthCreateDTO.java index f669cc08a..88fb2cc69 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthCreateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthCreateDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userAuthentication; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserAuthCreateDTO { @ApiModelProperty(value = "真实名称", required = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthResDTO.java index c089025e4..21cceff0e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userAuthentication/UserAuthResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userAuthentication; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -11,7 +10,7 @@ import lombok.experimental.Accessors; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class UserAuthResDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchAddToShopCartDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchAddToShopCartDTO.java index ebddba485..d30f38cc0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchAddToShopCartDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchAddToShopCartDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavBatchAddToShopCartDTO { @ApiModelProperty(value = "批量操作列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchDeleteDTO.java index d37c0c628..d142ae76a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchDeleteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavBatchDeleteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavBatchDeleteDTO { @ApiModelProperty("档口商品ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavStatusCountResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavStatusCountResDTO.java index 7286d005c..92cb64594 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavStatusCountResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavStatusCountResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDTO.java index 6a9be2f32..eb7780ffa 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,7 +12,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoriteDTO { @ApiModelProperty("用户新增收藏列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDeleteDTO.java index fe71ff2fd..3a805917d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDeleteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoriteDeleteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoriteDeleteDTO { @ApiModelProperty(value = "用户收藏ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageDTO.java index c0f54a232..373432cd0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userFavorite; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.BasePageDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +14,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserFavoritePageDTO extends BasePageDTO { @ApiModelProperty(value = "用户ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageResDTO.java index 2a7824456..7e2a3f44b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userFavorite/UserFavoritePageResDTO.java @@ -1,7 +1,6 @@ package com.ruoyi.xkt.dto.userFavorite; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,7 +14,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class UserFavoritePageResDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDeleteDTO.java index 55ad3ddfb..3f7b40168 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDeleteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDeleteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("进货车删除") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartDeleteDTO { @ApiModelProperty(value = "进货车ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDetailResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDetailResDTO.java index f5043cbeb..2cbbe9053 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDetailResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartDetailResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +15,7 @@ import java.util.List; */ @ApiModel("档口商品详情返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class ShopCartDetailResDTO { diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartListDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartListDTO.java index ca326fd18..f0c60bf2c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartListDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartListDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartListDTO { @ApiModelProperty(value = "档口商品ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDTO.java index 8ec98f5ec..fc5b2ff2a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.BasePageDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +16,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @ApiModel("电商卖家新增进货车") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartPageDTO extends BasePageDTO { @ApiModelProperty(value = "userId") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java index 8fc5f0c49..33284fb76 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java index cf5d88c32..e5c4fb862 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("电商卖家进货车列表返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartPageResDTO { @ApiModelProperty(value = "主图") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartResDTO.java index 5423d0981..84293f356 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,7 @@ import java.util.List; */ @ApiModel("电商卖家进货车数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartResDTO { @ApiModelProperty(value = "进货车ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartStatusCountResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartStatusCountResDTO.java index 4c83fcaf3..bd516549d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartStatusCountResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartStatusCountResDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +9,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShopCartStatusCountResDTO { @ApiModelProperty(value = "在售数量") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java index abc32935a..18f297f1d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,7 +14,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShoppingCartDTO { @ApiModelProperty(value = "档口ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartEditDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartEditDTO.java index cee777bea..8df57d48c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartEditDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartEditDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userShoppingCart; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class ShoppingCartEditDTO { @ApiModelProperty(value = "进货车ID,编辑必传") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDTO.java index 6be8adb3a..7cd4d7746 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscDTO { @NotNull(message = "档口ID不能为空!") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDeleteDTO.java index 3f4ec0be8..6dcd35629 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDeleteDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscDeleteDTO.java @@ -1,6 +1,5 @@ package com.ruoyi.xkt.dto.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +11,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscDeleteDTO { @ApiModelProperty(value = "档口ID列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageDTO.java index c383bada4..85fb184bf 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageDTO.java @@ -1,13 +1,10 @@ package com.ruoyi.xkt.dto.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.xkt.dto.BasePageDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; - /** * @author liujiang * @version v1.0 @@ -15,7 +12,7 @@ import javax.validation.constraints.NotBlank; */ @EqualsAndHashCode(callSuper = true) @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + public class UserSubscPageDTO extends BasePageDTO { @ApiModelProperty(value = "档口名称") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageResDTO.java index 92cff5bb5..97c2ed783 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userSubscriptions/UserSubscPageResDTO.java @@ -1,14 +1,10 @@ package com.ruoyi.xkt.dto.userSubscriptions; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; -import java.util.Date; - /** * @author liujiang * @version v1.0 @@ -16,7 +12,7 @@ import java.util.Date; */ @ApiModel("电商卖家关注档口列表返回数据") @Data -@JsonInclude(JsonInclude.Include.NON_NULL) + @Accessors(chain = true) public class UserSubscPageResDTO {