From 7327b36175719ab062c4c8f32294824d7d68b65d Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 13 Jul 2025 13:41:26 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=85=A5=E5=8F=82=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E5=AE=8C=E5=96=84=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/account/AlipayStoreBindVO.java | 8 ++--- .../xkt/vo/account/AlipayUserBindVO.java | 8 ++--- .../xkt/vo/account/StoreRechargeReqVO.java | 8 ++--- .../vo/account/StoreRechargeResultReqVO.java | 2 +- .../vo/account/TransactionPasswordSetVO.java | 6 ++-- .../xkt/vo/account/WithdrawReqVO.java | 4 +-- .../adminAdvertRound/AdminAdRoundAuditVO.java | 2 ++ .../AdminAdRoundCancelInterceptVO.java | 6 ++-- .../adminAdvertRound/AdminAdRoundPageVO.java | 4 ++- .../AdminAdRoundStatusCountResVO.java | 2 ++ .../AdminAdRoundSysInterceptVO.java | 2 ++ .../AdminAdRoundUnsubscribeVO.java | 2 ++ .../xkt/vo/advert/AdvertChangeStatusVO.java | 6 ++-- .../xkt/vo/advert/AdvertPageVO.java | 2 ++ .../controller/xkt/vo/advert/AdvertResVO.java | 2 ++ .../xkt/vo/advert/AdvertUpdateVO.java | 4 ++- .../vo/advertRound/pc/PCSearchResultVO.java | 2 ++ .../pc/index/PCIndexBottomPopularVO.java | 1 - .../pc/index/PCIndexFixedEarVO.java | 2 ++ .../pc/index/PCIndexMidSalesVO.java | 2 ++ .../pc/index/PCIndexMidStyleVO.java | 1 - .../index/PCIndexSearchRecommendProdVO.java | 2 ++ .../PCIndexSearchUnderlineStoreNameVO.java | 2 ++ .../pc/index/PCIndexTopLeftBannerVO.java | 1 - .../pc/index/PCIndexTopRightBannerVO.java | 2 ++ .../pc/newProd/PCNewBottomBannerVO.java | 1 - .../pc/newProd/PCNewMidBrandVO.java | 1 - .../pc/newProd/PCNewMidHotLeftVO.java | 1 - .../pc/newProd/PCNewMidHotRightVO.java | 1 - .../pc/newProd/PCNewTopLeftBannerVO.java | 1 - .../pc/newProd/PCNewTopRightVO.java | 2 ++ .../pc/store/PCStoreMidBannerVO.java | 1 - .../pc/store/PCStoreTopBannerVO.java | 1 - .../AdvertRoundRecordPageVO.java | 2 +- .../vo/express/ExpressAddressParseReqVO.java | 2 +- .../xkt/vo/express/TrackRecordQueryVO.java | 2 +- .../xkt/vo/express/UserAddressCreateVO.java | 6 ++-- .../xkt/vo/express/UserAddressModifyVO.java | 8 ++--- .../xkt/vo/notice/NoticeCreateVO.java | 10 ++++--- .../xkt/vo/notice/NoticeDeleteVO.java | 4 ++- .../xkt/vo/notice/NoticeEditVO.java | 12 ++++---- .../xkt/vo/notice/NoticePageVO.java | 4 ++- .../controller/xkt/vo/notice/NoticeResVO.java | 2 +- .../xkt/vo/order/StoreOrderAddReqVO.java | 30 +++++++++---------- .../vo/order/StoreOrderAfterSaleReqVO.java | 11 +++---- .../xkt/vo/order/StoreOrderCancelReqVO.java | 2 +- .../xkt/vo/order/StoreOrderPageItemVO.java | 1 + .../xkt/vo/order/StoreOrderPayReqVO.java | 8 +++-- .../xkt/vo/order/StoreOrderPrintReqVO.java | 2 +- .../xkt/vo/order/StoreOrderReceiptReqVO.java | 2 +- .../vo/order/StoreOrderRefundConfirmVO.java | 2 +- .../order/StoreOrderShipByPlatformReqVO.java | 6 ++-- .../vo/order/StoreOrderShipByStoreReqVO.java | 8 ++--- .../xkt/vo/quickFunction/QuickFuncVO.java | 4 ++- .../xkt/vo/store/StoreAdvertResVO.java | 2 ++ .../controller/xkt/vo/store/StoreAuditVO.java | 2 ++ .../xkt/vo/store/StoreNameResVO.java | 2 ++ .../xkt/vo/store/StoreOverviewVO.java | 4 +-- .../controller/xkt/vo/store/StorePageVO.java | 2 ++ .../controller/xkt/vo/store/StoreResVO.java | 2 ++ .../vo/store/StoreSaleCustomerTop10VO.java | 4 +-- .../xkt/vo/store/StoreSaleRevenueVO.java | 4 +-- .../xkt/vo/store/StoreSaleTop10VO.java | 4 +-- .../xkt/vo/store/StoreSimpleResVO.java | 2 ++ .../xkt/vo/store/StoreUpdateDelFlagVO.java | 2 ++ .../xkt/vo/store/StoreUpdateVO.java | 2 ++ .../xkt/vo/store/StoreWeightUpdateVO.java | 2 ++ .../xkt/vo/storeCertificate/StoreCertVO.java | 2 ++ .../xkt/vo/storeColor/StoreColorVO.java | 2 ++ .../storeCustomer/StoreCusAddOverPriceVO.java | 2 ++ .../vo/storeCustomer/StoreCusFuzzyResVO.java | 2 ++ .../storeCustomer/StoreCusGeneralSaleVO.java | 2 ++ .../xkt/vo/storeCustomer/StoreCusPageVO.java | 2 ++ .../xkt/vo/storeCustomer/StoreCusVO.java | 2 ++ .../vo/storeFactory/StoreFactoryPageVO.java | 2 ++ .../xkt/vo/storeFactory/StoreFactoryVO.java | 2 ++ .../storeHomepage/StoreHomeDecorationVO.java | 2 ++ .../StoreHomeTemplateFiveResVO.java | 2 ++ .../StoreHomeTemplateTwoResVO.java | 1 + .../vo/storeMember/StoreMemberCreateVO.java | 4 ++- .../storePordColor/StoreProdColorResVO.java | 3 +- .../xkt/vo/storeProd/StoreProdAppResVO.java | 4 +++ .../xkt/vo/storeProd/StoreProdCreateVO.java | 10 +++++-- .../storeProd/StoreProdFuzzyColorResVO.java | 3 ++ .../vo/storeProd/StoreProdFuzzyResPicVO.java | 2 ++ .../xkt/vo/storeProd/StoreProdPCResVO.java | 4 +++ .../xkt/vo/storeProd/StoreProdPageResVO.java | 2 ++ .../xkt/vo/storeProd/StoreProdPageVO.java | 2 ++ .../vo/storeProd/StoreProdPicSpaceResVO.java | 2 ++ .../xkt/vo/storeProd/StoreProdResVO.java | 4 +-- .../xkt/vo/storeProd/StoreProdSkuResVO.java | 2 ++ .../StoreProdStatusCateCountResVO.java | 3 ++ .../storeProd/StoreProdStatusCateNumVO.java | 4 ++- .../storeProd/StoreProdStatusCountResVO.java | 2 ++ .../xkt/vo/storeProd/StoreProdStatusVO.java | 2 ++ .../xkt/vo/storeProd/StoreProdUpdateVO.java | 9 +++++- .../xkt/vo/storeProd/StoreProdVO.java | 8 +++++ .../xkt/vo/storeProd/StoreProdViewVO.java | 4 +-- .../storeProdBarcodeMatch/BarcodeMatchVO.java | 4 +++ .../StoreProdColorPricePageVO.java | 2 ++ .../storeProdColorSize/StorePrintSnResVO.java | 1 + .../vo/storeProdColorSize/StorePrintSnVO.java | 2 ++ .../storeProdColorSize/StoreSaleSnResVO.java | 1 + .../StoreStockTakingSnResVO.java | 1 + .../StoreStorageSnResVO.java | 4 ++- .../storeProdStock/StoreProdCheckStockVO.java | 9 +++--- .../StoreProdStockAndDiscountResVO.java | 1 + .../StoreProdStockClearZeroVO.java | 4 ++- .../StoreProdStockExportVO.java | 4 ++- .../storeProdStock/StoreProdStockPageVO.java | 4 +-- .../storeProdStock/StoreProdStockResVO.java | 2 ++ .../vo/storeProdStock/StoreProdStockVO.java | 2 ++ .../StoreProdStorageResVO.java | 3 ++ .../storeProdStorage/StoreProdStorageVO.java | 1 + .../StoreStorageExportVO.java | 4 ++- .../StoreProdDemandDeleteVO.java | 2 ++ .../StoreProdDemandExportVO.java | 2 ++ .../StoreProdDemandFinishAllVO.java | 2 ++ .../StoreProdDemandPageResVO.java | 2 ++ .../StoreProdDemandPageVO.java | 2 ++ .../StoreProdDemandStatusCountResVO.java | 2 ++ .../storeProductDemand/StoreProdDemandVO.java | 1 + .../StoreProdDemandVerifyResVO.java | 2 ++ .../StoreProdDemandVerifyVO.java | 3 ++ .../StoreProdDemandWorkingVO.java | 2 ++ .../StoreProdFilePicSpaceResVO.java | 2 ++ .../StoreProdStorageDemandDeductVO.java | 1 + .../xkt/vo/storeRole/StoreRoleResVO.java | 2 ++ .../vo/storeRole/StoreRoleUpdateStatusVO.java | 2 ++ .../xkt/vo/storeRole/StoreRoleVO.java | 2 +- .../StoreRoleAccDetailResVO.java | 3 ++ .../storeRoleAccount/StoreRoleAccListVO.java | 2 ++ .../storeRoleAccount/StoreRoleAccResVO.java | 2 ++ .../StoreRoleAccUpdateStatusVO.java | 2 ++ .../StoreRoleAccUpdateVO.java | 2 ++ .../vo/storeRoleAccount/StoreRoleAccVO.java | 4 ++- .../xkt/vo/storeSale/StoreSaleExportVO.java | 2 +- .../xkt/vo/storeSale/StoreSalePageVO.java | 2 ++ .../xkt/vo/storeSale/StoreSaleResVO.java | 3 ++ .../vo/storeSale/StoreSaleUpdateMemoVO.java | 4 +-- .../xkt/vo/storeSale/StoreSaleVO.java | 1 + .../userAuthentication/UserAuthAuditVO.java | 2 ++ .../userAuthentication/UserAuthCreateVO.java | 9 ++++-- .../vo/userAuthentication/UserAuthPageVO.java | 2 ++ .../vo/userAuthentication/UserAuthResVO.java | 2 ++ .../UserAuthUpdateDelFlagVO.java | 2 ++ .../UserBrowHisPageVO.java | 2 ++ .../UserFavBatchAddToShopCartVO.java | 1 + .../vo/userFavorite/UserFavBatchDeleteVO.java | 2 +- .../vo/userFavorite/UserFavoritePageVO.java | 4 ++- .../xkt/vo/userFavorite/UserFavoriteVO.java | 7 +++-- .../xkt/vo/userIndex/UserOverallResVO.java | 2 ++ .../vo/userNotice/UserNoticeAppListResVO.java | 2 ++ .../userNotice/UserNoticeAppTypePageVO.java | 4 ++- .../xkt/vo/userNotice/UserNoticePageVO.java | 2 ++ .../vo/userShoppingCart/ShopCartDeleteVO.java | 2 +- .../ShopCartEditDetailResVO.java | 5 ++++ .../vo/userShoppingCart/ShopCartEditVO.java | 23 +++++++------- .../vo/userShoppingCart/ShopCartListVO.java | 2 +- .../vo/userShoppingCart/ShopCartPageVO.java | 2 +- .../vo/userShoppingCart/ShopCartResVO.java | 1 + .../ShopCartStatusCountResVO.java | 2 ++ .../ShopCartToOrderResVO.java | 3 ++ .../xkt/vo/userShoppingCart/ShopCartVO.java | 19 ++++++------ .../userSubscriptions/UserSubscDeleteVO.java | 2 +- .../xkt/vo/website/IndexSearchVO.java | 2 ++ .../xkt/vo/website/StoreSearchVO.java | 2 ++ 167 files changed, 406 insertions(+), 158 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayStoreBindVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayStoreBindVO.java index 7f4cfc199..680ab528c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayStoreBindVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayStoreBindVO.java @@ -17,24 +17,24 @@ public class AlipayStoreBindVO { * 账号 */ @NotEmpty(message = "账号不能为空") - @ApiModelProperty(value = "账号") + @ApiModelProperty(value = "账号", required = true) private String accountOwnerNumber; /** * 姓名 */ @NotEmpty(message = "姓名不能为空") - @ApiModelProperty(value = "姓名") + @ApiModelProperty(value = "姓名", required = true) private String accountOwnerName; /** * 手机号 */ @NotEmpty(message = "手机号不能为空") - @ApiModelProperty(value = "手机号") + @ApiModelProperty(value = "手机号", required = true) private String accountOwnerPhoneNumber; /** * 验证码 */ @NotEmpty(message = "验证码不能为空") - @ApiModelProperty(value = "验证码") + @ApiModelProperty(value = "验证码", required = true) private String verifyCode; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayUserBindVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayUserBindVO.java index b20f4d79b..0011b2485 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayUserBindVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/AlipayUserBindVO.java @@ -17,24 +17,24 @@ public class AlipayUserBindVO { * 账号 */ @NotEmpty(message = "账号不能为空") - @ApiModelProperty(value = "账号") + @ApiModelProperty(value = "账号", required = true) private String accountOwnerNumber; /** * 姓名 */ @NotEmpty(message = "姓名不能为空") - @ApiModelProperty(value = "姓名") + @ApiModelProperty(value = "姓名", required = true) private String accountOwnerName; /** * 手机号 */ @NotEmpty(message = "手机号不能为空") - @ApiModelProperty(value = "手机号") + @ApiModelProperty(value = "手机号", required = true) private String accountOwnerPhoneNumber; /** * 验证码 */ @NotEmpty(message = "验证码不能为空") - @ApiModelProperty(value = "验证码") + @ApiModelProperty(value = "验证码", required = true) private String verifyCode; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java index b34d19702..ad2491aaa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java @@ -16,14 +16,12 @@ import java.math.BigDecimal; public class StoreRechargeReqVO { @NotNull(message = "充值金额不能为空") - @ApiModelProperty(value = "充值金额") + @ApiModelProperty(value = "充值金额", required = true) private BigDecimal amount; - @NotNull(message = "支付渠道不能为空") - @ApiModelProperty(value = "支付渠道[1:支付宝]") + @ApiModelProperty(value = "支付渠道[1:支付宝]", required = true) private Integer payChannel; - @NotNull(message = "支付来源不能为空") - @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站]") + @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站]", required = true) private Integer payPage; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeResultReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeResultReqVO.java index 2735ef040..46b6eb142 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeResultReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeResultReqVO.java @@ -15,6 +15,6 @@ import javax.validation.constraints.NotEmpty; public class StoreRechargeResultReqVO { @NotEmpty(message = "付款单号不能为空") - @ApiModelProperty(value = "付款单号") + @ApiModelProperty(value = "付款单号", required = true) private String financeBillNo; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/TransactionPasswordSetVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/TransactionPasswordSetVO.java index c1a569a8e..d073795c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/TransactionPasswordSetVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/TransactionPasswordSetVO.java @@ -17,18 +17,18 @@ public class TransactionPasswordSetVO { * 手机号 */ @NotEmpty(message = "手机号不能为空") - @ApiModelProperty(value = "手机号") + @ApiModelProperty(value = "手机号", required = true) private String phoneNumber; /** * 验证码 */ @NotEmpty(message = "验证码不能为空") - @ApiModelProperty(value = "验证码") + @ApiModelProperty(value = "验证码", required = true) private String verifyCode; /** * 交易密码 */ @NotEmpty(message = "交易密码不能为空") - @ApiModelProperty(value = "交易密码") + @ApiModelProperty(value = "交易密码", required = true) private String transactionPassword; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/WithdrawReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/WithdrawReqVO.java index 74ebbcbdf..219696e7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/WithdrawReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/WithdrawReqVO.java @@ -17,11 +17,11 @@ import java.math.BigDecimal; public class WithdrawReqVO { @NotNull(message = "金额不能为空") - @ApiModelProperty(value = "金额") + @ApiModelProperty(value = "金额", required = true) private BigDecimal amount; @NotEmpty(message = "支付密码不能为空") - @ApiModelProperty(value = "支付密码") + @ApiModelProperty(value = "支付密码", required = true) private String transactionPassword; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundAuditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundAuditVO.java index 953e7833d..5505d41f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundAuditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundAuditVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class AdminAdRoundAuditVO { @NotNull(message = "advertRoundId不能为空") 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 4afc5f285..7665da6da 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,7 @@ 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; import lombok.experimental.Accessors; @@ -13,15 +14,16 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) public class AdminAdRoundCancelInterceptVO { @NotNull(message = "推广轮次ID不能为空") - @ApiModelProperty(value = "推广轮次ID") + @ApiModelProperty(value = "推广轮次ID", required = true) private Long advertRoundId; @NotNull(message = "档口ID不能为空") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundPageVO.java index eb2e14948..791a10896 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,10 +15,11 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class AdminAdRoundPageVO extends BasePageVO { @NotNull(message = "投放状态不能为空!") - @ApiModelProperty(value = "投放状态 1投放中 2待投放") + @ApiModelProperty(value = "投放状态 1投放中 2待投放", required = true) private Integer launchStatus; @ApiModelProperty(value = "平台ID") private Integer platformId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundStatusCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundStatusCountResVO.java index 3faa4a6fe..36b14949f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundStatusCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundStatusCountResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -10,6 +11,7 @@ import lombok.experimental.Accessors; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class AdminAdRoundStatusCountResVO { 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 871fc02e8..2e4f4e0be 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,7 @@ 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; import lombok.experimental.Accessors; @@ -16,6 +17,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) public class AdminAdRoundSysInterceptVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundUnsubscribeVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundUnsubscribeVO.java index 44750204b..8b2e1c1b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundUnsubscribeVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/adminAdvertRound/AdminAdRoundUnsubscribeVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.adminAdvertRound; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class AdminAdRoundUnsubscribeVO { @NotNull(message = "advertRoundId不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertChangeStatusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertChangeStatusVO.java index ff09118bd..8b660d134 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertChangeStatusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertChangeStatusVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advert; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,13 +13,14 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class AdvertChangeStatusVO { - @ApiModelProperty(value = "推广ID") + @ApiModelProperty(value = "推广ID", required = true) @NotNull(message = "推广ID不能为空!") private Long advertId; - @ApiModelProperty(value = "推广状态") + @ApiModelProperty(value = "推广状态", required = true) @NotNull(message = "推广状态不能为空!") private Integer status; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertPageVO.java index 425faad24..afc6e8c1d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.advert; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class AdvertPageVO extends BasePageVO { @ApiModelProperty(value = "上线状态") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java index 01648dc7d..1dec72382 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.advert; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class AdvertResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java index 737ea9dfb..94c2b02fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advert/AdvertUpdateVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.advert; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -16,6 +17,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class AdvertUpdateVO { @@ -72,7 +74,7 @@ public class AdvertUpdateVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date discountEndTime; @NotBlank(message = "截止时间不能为空!") - @ApiModelProperty(value = "截止时间") + @ApiModelProperty(value = "截止时间", required = true) private String deadline; @Data diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/PCSearchResultVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/PCSearchResultVO.java index 04fdf1228..7386a86cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/PCSearchResultVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/PCSearchResultVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCSearchResultVO { @ApiModelProperty(value = "2商品") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexBottomPopularVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexBottomPopularVO.java index 2d299ce2f..2cd7054b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexBottomPopularVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexBottomPopularVO.java @@ -14,7 +14,6 @@ import java.util.List; */ @ApiModel("PC 首页 人气榜") @Data - public class PCIndexBottomPopularVO { @ApiModelProperty(value = "左侧列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexFixedEarVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexFixedEarVO.java index 65b795c12..36a140aa9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexFixedEarVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexFixedEarVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.index; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,6 +9,7 @@ import lombok.Data; * @version v1.0 * @date 2025/3/27 15:12 */ +@ApiModel @Data public class PCIndexFixedEarVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidSalesVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidSalesVO.java index 9ce4c35b1..e1478185a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidSalesVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidSalesVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.index; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCIndexMidSalesVO { @ApiModelProperty(value = "分类ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidStyleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidStyleVO.java index d87a14c47..703e8aa0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidStyleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidStyleVO.java @@ -14,7 +14,6 @@ import java.util.List; */ @ApiModel("PC 首页 风格榜") @Data - public class PCIndexMidStyleVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java index da1825e71..d17c4472d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.index; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCIndexSearchRecommendProdVO { @ApiModelProperty(value = "2 商品") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchUnderlineStoreNameVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchUnderlineStoreNameVO.java index 031f726da..daed9ab6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchUnderlineStoreNameVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchUnderlineStoreNameVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.index; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCIndexSearchUnderlineStoreNameVO { @ApiModelProperty(value = "4 档口名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopLeftBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopLeftBannerVO.java index e072db4ea..236cfb07c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopLeftBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopLeftBannerVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("PC 首页 顶部横向轮播图") @Data - public class PCIndexTopLeftBannerVO { @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品、4店铺名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java index 75da55106..eafd47a5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.index; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCIndexTopRightBannerVO { @ApiModelProperty(value = "展示类型 1推广图、2商品、3推广图及商品、4店铺名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewBottomBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewBottomBannerVO.java index 755d655ca..108939ebe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewBottomBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewBottomBannerVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("PC 新品馆 底部横幅") @Data - public class PCNewBottomBannerVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidBrandVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidBrandVO.java index 4feb78809..f41113b5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidBrandVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidBrandVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("PC 新品馆 品牌馆") @Data - public class PCNewMidBrandVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotLeftVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotLeftVO.java index 77738ae7d..da36953ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotLeftVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotLeftVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("PC 新品馆 热卖榜左侧大图") @Data - public class PCNewMidHotLeftVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotRightVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotRightVO.java index 14ca623e8..fb0bd9975 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotRightVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewMidHotRightVO.java @@ -13,7 +13,6 @@ import java.math.BigDecimal; */ @ApiModel("PC 新品馆 热卖榜右侧商品") @Data - public class PCNewMidHotRightVO { @ApiModelProperty(value = "2商品") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopLeftBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopLeftBannerVO.java index d2712c425..ad7f5fbc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopLeftBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopLeftBannerVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("PC 新品馆 顶部横向轮播图") @Data - public class PCNewTopLeftBannerVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopRightVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopRightVO.java index a96a0bd9b..606acbc75 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopRightVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/newProd/PCNewTopRightVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.advertRound.pc.newProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class PCNewTopRightVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreMidBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreMidBannerVO.java index a1ab22ba8..ce7cd91a5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreMidBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreMidBannerVO.java @@ -11,7 +11,6 @@ import lombok.Data; */ @ApiModel("以图搜款") @Data - public class PCStoreMidBannerVO { @ApiModelProperty(value = "1推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreTopBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreTopBannerVO.java index 29cce5845..84abe4fdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreTopBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/store/PCStoreTopBannerVO.java @@ -14,7 +14,6 @@ import java.util.List; */ @ApiModel("PC 档口馆 顶部横幅") @Data - public class PCStoreTopBannerVO { @ApiModelProperty(value = "1 推广图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRoundRecord/AdvertRoundRecordPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRoundRecord/AdvertRoundRecordPageVO.java index 422ab83f2..73d092e5c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRoundRecord/AdvertRoundRecordPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRoundRecord/AdvertRoundRecordPageVO.java @@ -20,7 +20,7 @@ import java.util.Date; public class AdvertRoundRecordPageVO extends BasePageVO { @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @ApiModelProperty(value = "平台ID") private Long platformId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressAddressParseReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressAddressParseReqVO.java index bd2e89d44..19bbc721c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressAddressParseReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressAddressParseReqVO.java @@ -15,6 +15,6 @@ import javax.validation.constraints.NotEmpty; public class ExpressAddressParseReqVO { @NotEmpty - @ApiModelProperty(value = "地址，包含地址、姓名、电话等") + @ApiModelProperty(value = "地址，包含地址、姓名、电话等", required = true) private String address; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/TrackRecordQueryVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/TrackRecordQueryVO.java index f1eb5bfb6..b9507a3ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/TrackRecordQueryVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/TrackRecordQueryVO.java @@ -18,6 +18,6 @@ import java.util.List; public class TrackRecordQueryVO { @NotEmpty(message = "物流运单号不能为空") - @ApiModelProperty(value = "物流运单号集合") + @ApiModelProperty(value = "物流运单号集合", required = true) private List expressWaybillNos; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressCreateVO.java index 1cce199a3..26b3ed362 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressCreateVO.java @@ -15,14 +15,14 @@ import javax.validation.constraints.NotEmpty; public class UserAddressCreateVO { @NotEmpty - @ApiModelProperty(value = "收件人名称") + @ApiModelProperty(value = "收件人名称", required = true) private String receiveName; @NotEmpty - @ApiModelProperty(value = "收件人电话") + @ApiModelProperty(value = "收件人电话", required = true) private String receivePhone; @NotEmpty - @ApiModelProperty(value = "收件人完整地址") + @ApiModelProperty(value = "收件人完整地址", required = true) private String address; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressModifyVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressModifyVO.java index fc173f3a4..fb0ab398c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressModifyVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/UserAddressModifyVO.java @@ -16,18 +16,18 @@ import javax.validation.constraints.NotNull; public class UserAddressModifyVO { @NotNull - @ApiModelProperty(value = "ID") + @ApiModelProperty(value = "ID", required = true) private Long id; @NotEmpty - @ApiModelProperty(value = "收件人名称") + @ApiModelProperty(value = "收件人名称", required = true) private String receiveName; @NotEmpty - @ApiModelProperty(value = "收件人电话") + @ApiModelProperty(value = "收件人电话", required = true) private String receivePhone; @NotEmpty - @ApiModelProperty(value = "收件人完整地址") + @ApiModelProperty(value = "收件人完整地址", required = true) private String address; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeCreateVO.java index 7376cd299..db5cc5e2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeCreateVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.notice; import com.ruoyi.common.xss.Xss; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -16,22 +17,23 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class NoticeCreateVO { @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - @ApiModelProperty(value = "公告标题") + @ApiModelProperty(value = "公告标题", required = true) private String noticeTitle; @NotNull(message = "公告类型不能为空") - @ApiModelProperty(value = "公告类型") + @ApiModelProperty(value = "公告类型", required = true) private Integer noticeType; @NotBlank(message = "公告内容不能为空") - @ApiModelProperty(value = "公告内容") + @ApiModelProperty(value = "公告内容", required = true) private String noticeContent; @NotNull(message = "谁发的公告不能为空!") - @ApiModelProperty(value = "谁发的公告 1 档口 2 系统") + @ApiModelProperty(value = "谁发的公告 1 档口 2 系统", required = true) private Integer ownerType; @ApiModelProperty(value = "档口id") private Long storeId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeDeleteVO.java index fed7aef2b..7920d1d1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeDeleteVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.notice; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,11 +14,12 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class NoticeDeleteVO { @NotNull(message = "公告ID不能为空") - @ApiModelProperty(value = "公告ID列表") + @ApiModelProperty(value = "公告ID列表", required = true) List noticeIdList; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeEditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeEditVO.java index 44ce19bd5..d70dfe179 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeEditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeEditVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.notice; import com.ruoyi.common.xss.Xss; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -16,25 +17,26 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class NoticeEditVO { @NotNull(message = "公告ID不能为空") - @ApiModelProperty(value = "公告ID") + @ApiModelProperty(value = "公告ID", required = true) private Long noticeId; @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - @ApiModelProperty(value = "公告标题") + @ApiModelProperty(value = "公告标题", required = true) private String noticeTitle; @NotNull(message = "公告类型不能为空") - @ApiModelProperty(value = "公告类型") + @ApiModelProperty(value = "公告类型", required = true) private Integer noticeType; @NotBlank(message = "公告内容不能为空") - @ApiModelProperty(value = "公告内容") + @ApiModelProperty(value = "公告内容", required = true) private String noticeContent; @NotNull(message = "谁发的公告不能为空!") - @ApiModelProperty(value = "谁发的公告 1 档口 2 系统") + @ApiModelProperty(value = "谁发的公告 1 档口 2 系统", required = true) private Integer ownerType; @ApiModelProperty(value = "档口id") private Long storeId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java index 301f8c4cc..eb36e6930 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticePageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.notice; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,12 +15,13 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class NoticePageVO extends BasePageVO { @ApiModelProperty(value = "公告标题") private String noticeTitle; @NotNull(message = "ownerType不能为空") - @ApiModelProperty(value = "谁发的公告 1 档口 2 系统") + @ApiModelProperty(value = "谁发的公告 1 档口 2 系统", required = true) private Integer ownerType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeResVO.java index 1c5c5f64f..8998d56df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/notice/NoticeResVO.java @@ -12,7 +12,7 @@ import java.util.Date; * @version v1.0 * @date 2025/3/27 15:12 */ -@ApiModel("新增公告") +@ApiModel @Data @Accessors(chain = true) public class NoticeResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAddReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAddReqVO.java index 88c9a75d7..60f822a15 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAddReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAddReqVO.java @@ -21,7 +21,7 @@ public class StoreOrderAddReqVO { * 档口ID */ @NotNull(message = "档口ID不能为空") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; /** * 订单备注 @@ -32,49 +32,49 @@ public class StoreOrderAddReqVO { * 物流ID */ @NotNull(message = "物流ID不能为空") - @ApiModelProperty(value = "物流ID") + @ApiModelProperty(value = "物流ID", required = true) private Long expressId; /** * 收货人-名称 */ @NotEmpty(message = "收货人名称不能为空") - @ApiModelProperty(value = "收货人-名称") + @ApiModelProperty(value = "收货人-名称", required = true) private String destinationContactName; /** * 收货人-电话 */ @NotEmpty(message = "收货人电话不能为空") - @ApiModelProperty(value = "收货人-电话") + @ApiModelProperty(value = "收货人-电话", required = true) private String destinationContactPhoneNumber; /** * 收货人-省编码 */ @NotEmpty(message = "收货人省编码不能为空") - @ApiModelProperty(value = "收货人-省编码") + @ApiModelProperty(value = "收货人-省编码", required = true) private String destinationProvinceCode; /** * 收货人-市编码 */ @NotEmpty(message = "收货人市编码不能为空") - @ApiModelProperty(value = "收货人-市编码") + @ApiModelProperty(value = "收货人-市编码", required = true) private String destinationCityCode; /** * 收货人-区县编码 */ @NotEmpty(message = "收货人区县编码不能为空") - @ApiModelProperty(value = "收货人-区县编码") + @ApiModelProperty(value = "收货人-区县编码", required = true) private String destinationCountyCode; /** * 收货人-详细地址 */ @NotEmpty(message = "收货人详细地址不能为空") - @ApiModelProperty(value = "收货人-详细地址") + @ApiModelProperty(value = "收货人-详细地址", required = true) private String destinationDetailAddress; /** * 发货方式[1:货其再发 2:有货先发] */ @NotNull(message = "发货方式不能为空") - @ApiModelProperty(value = "发货方式[1:货其再发 2:有货先发]") + @ApiModelProperty(value = "发货方式[1:货其再发 2:有货先发]", required = true) private Integer deliveryType; /** * 最晚发货时间 @@ -86,19 +86,19 @@ public class StoreOrderAddReqVO { */ @Valid @NotEmpty(message = "订单明细不能为空") - @ApiModelProperty(value = "明细列表") + @ApiModelProperty(value = "明细列表", required = true) private List detailList; @NotNull(message = "是否发起支付不能为空") - @ApiModelProperty(value = "是否发起支付") + @ApiModelProperty(value = "是否发起支付", required = true) private Boolean beginPay; @NotNull(message = "支付渠道不能为空") - @ApiModelProperty(value = "支付渠道[1:支付宝]") + @ApiModelProperty(value = "支付渠道[1:支付宝]", required = true) private Integer payChannel; @NotNull(message = "支付来源不能为空") - @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站 3:APP]") + @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站 3:APP]", required = true) private Integer payPage; @ApiModel(value = "明细") @@ -106,11 +106,11 @@ public class StoreOrderAddReqVO { public static class Detail { @NotNull(message = "商品颜色尺码ID不能为空") - @ApiModelProperty(value = "商品颜色尺码ID") + @ApiModelProperty(value = "商品颜色尺码ID", required = true) private Long storeProdColorSizeId; @NotNull(message = "商品数量不能为空") - @ApiModelProperty(value = "商品数量") + @ApiModelProperty(value = "商品数量", required = true) private Integer goodsQuantity; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAfterSaleReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAfterSaleReqVO.java index 43b720e88..d79a048ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAfterSaleReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderAfterSaleReqVO.java @@ -17,20 +17,17 @@ import java.util.List; public class StoreOrderAfterSaleReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; - @NotEmpty(message = "订单明细ID不能为空") - @ApiModelProperty(value = "订单明细ID") + @ApiModelProperty(value = "订单明细ID", required = true) private List storeOrderDetailIds; - @NotNull(message = "退货原因不能为空") - @ApiModelProperty(value = "退货原因code") + @ApiModelProperty(value = "退货原因code", required = true) private String refundReasonCode; - @ApiModelProperty(value = "物流ID") private Long expressId; - @ApiModelProperty(value = "物流运单号") private String expressWaybillNo; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderCancelReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderCancelReqVO.java index 16dd1b2e7..cf6a88e41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderCancelReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderCancelReqVO.java @@ -15,6 +15,6 @@ import javax.validation.constraints.NotNull; public class StoreOrderCancelReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java index 46f6d8cca..1b5ae603d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java @@ -16,6 +16,7 @@ import java.util.List; * @date 2025-04-14 11:18 */ @Data +@ApiModel @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class StoreOrderPageItemVO extends StoreOrderDTO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPayReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPayReqVO.java index 064a59b97..23ee24665 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPayReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPayReqVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.order; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,17 +11,18 @@ import javax.validation.constraints.NotNull; * @date 2025-04-07 18:16 */ @Data +@ApiModel public class StoreOrderPayReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; @NotNull(message = "支付渠道不能为空") - @ApiModelProperty(value = "支付渠道[1:支付宝]") + @ApiModelProperty(value = "支付渠道[1:支付宝]", required = true) private Integer payChannel; @NotNull(message = "支付来源不能为空") - @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站]") + @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站]", required = true) private Integer payPage; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPrintReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPrintReqVO.java index 73785efa7..008e802e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPrintReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPrintReqVO.java @@ -16,6 +16,6 @@ import java.util.List; public class StoreOrderPrintReqVO { @NotEmpty(message = "订单明细ID不能为空") - @ApiModelProperty(value = "订单明细ID") + @ApiModelProperty(value = "订单明细ID", required = true) private List storeOrderDetailIds; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderReceiptReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderReceiptReqVO.java index 2a88b024c..45e0e5257 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderReceiptReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderReceiptReqVO.java @@ -15,6 +15,6 @@ import javax.validation.constraints.NotNull; public class StoreOrderReceiptReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderRefundConfirmVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderRefundConfirmVO.java index 3ff1a86ef..cbf314bb8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderRefundConfirmVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderRefundConfirmVO.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull; public class StoreOrderRefundConfirmVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByPlatformReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByPlatformReqVO.java index b0292d611..a406d8705 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByPlatformReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByPlatformReqVO.java @@ -17,15 +17,15 @@ import java.util.List; public class StoreOrderShipByPlatformReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; @NotEmpty(message = "订单明细ID不能为空") - @ApiModelProperty(value = "订单明细ID") + @ApiModelProperty(value = "订单明细ID", required = true) private List storeOrderDetailIds; @NotNull(message = "物流ID不能为空") - @ApiModelProperty(value = "物流ID") + @ApiModelProperty(value = "物流ID", required = true) private Long expressId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByStoreReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByStoreReqVO.java index afea12eeb..1754cfd31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByStoreReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderShipByStoreReqVO.java @@ -17,19 +17,19 @@ import java.util.List; public class StoreOrderShipByStoreReqVO { @NotNull(message = "订单ID不能为空") - @ApiModelProperty(value = "订单ID") + @ApiModelProperty(value = "订单ID", required = true) private Long storeOrderId; @NotEmpty(message = "订单明细ID不能为空") - @ApiModelProperty(value = "订单明细ID") + @ApiModelProperty(value = "订单明细ID", required = true) private List storeOrderDetailIds; @NotNull(message = "物流ID不能为空") - @ApiModelProperty(value = "物流ID") + @ApiModelProperty(value = "物流ID", required = true) private Long expressId; @NotEmpty(message = "物流单号不能为空") - @ApiModelProperty(value = "物流单号") + @ApiModelProperty(value = "物流单号", required = true) private String expressWaybillNo; } 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 66a67ba51..85d4cd807 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,7 @@ 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.*; @@ -12,6 +13,7 @@ import java.util.List; * @version v1.0 * @date 2025/3/27 15:12 */ +@ApiModel @Data @Builder @JsonInclude(JsonInclude.Include.NON_NULL) @@ -22,7 +24,7 @@ public class QuickFuncVO { @ApiModelProperty(value = "业务ID 根据roleId确定，可能为store_id、user_id", required = true) @NotNull(message = "业务ID不能为空!") private Long bizId; - @ApiModelProperty(value = "角色ID") + @ApiModelProperty(value = "角色ID", required = true) @NotNull(message = "角色ID不能为空!") private Long roleId; @ApiModelProperty(value = "档口勾选的快捷功能", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAdvertResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAdvertResVO.java index b64a1b7a9..4ad0a78a5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAdvertResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAdvertResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreAdvertResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java index fb7767db3..f7b80fb4a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.store; import com.ruoyi.web.controller.xkt.vo.storeCertificate.StoreCertVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreAuditVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreNameResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreNameResVO.java index 9524a16ad..a954018ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreNameResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreNameResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreNameResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreOverviewVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreOverviewVO.java index f45be5d3c..12d678505 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreOverviewVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreOverviewVO.java @@ -22,11 +22,11 @@ public class StoreOverviewVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; - @ApiModelProperty(value = "查询开始时间") + @ApiModelProperty(value = "查询开始时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询开始时间不能为空") private Date voucherDateStart; - @ApiModelProperty(value = "查询结束时间") + @ApiModelProperty(value = "查询结束时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询结束时间不能为空") private Date voucherDateEnd; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StorePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StorePageVO.java index 15ee098d3..578a48995 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StorePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StorePageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.store; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StorePageVO extends BasePageVO { @ApiModelProperty(value = "档口名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java index 160c90c6d..81f10838b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.store; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleCustomerTop10VO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleCustomerTop10VO.java index 445301fa8..467d95597 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleCustomerTop10VO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleCustomerTop10VO.java @@ -22,11 +22,11 @@ public class StoreSaleCustomerTop10VO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; - @ApiModelProperty(value = "查询开始时间") + @ApiModelProperty(value = "查询开始时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询开始时间不能为空") private Date voucherDateStart; - @ApiModelProperty(value = "查询结束时间") + @ApiModelProperty(value = "查询结束时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询结束时间不能为空") private Date voucherDateEnd; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleRevenueVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleRevenueVO.java index 1d3806608..13dbb9a80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleRevenueVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleRevenueVO.java @@ -22,11 +22,11 @@ public class StoreSaleRevenueVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; - @ApiModelProperty(value = "查询开始时间") + @ApiModelProperty(value = "查询开始时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询开始时间不能为空") private Date voucherDateStart; - @ApiModelProperty(value = "查询结束时间") + @ApiModelProperty(value = "查询结束时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询结束时间不能为空") private Date voucherDateEnd; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleTop10VO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleTop10VO.java index 26211491b..a94b50a5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleTop10VO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSaleTop10VO.java @@ -22,11 +22,11 @@ public class StoreSaleTop10VO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; - @ApiModelProperty(value = "查询开始时间") + @ApiModelProperty(value = "查询开始时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询开始时间不能为空") private Date voucherDateStart; - @ApiModelProperty(value = "查询结束时间") + @ApiModelProperty(value = "查询结束时间", required = true) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @NotNull(message = "查询结束时间不能为空") private Date voucherDateEnd; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java index 8bcfe20d0..343b892ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreSimpleResVO { @ApiModelProperty(value = "档口模板ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateDelFlagVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateDelFlagVO.java index dd4f3d356..ea91ad254 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateDelFlagVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateDelFlagVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreUpdateDelFlagVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java index 6881c9386..484e8d2de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ import javax.validation.constraints.Pattern; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreUpdateVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreWeightUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreWeightUpdateVO.java index e990e2830..4d72b1fcd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreWeightUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreWeightUpdateVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.store; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreWeightUpdateVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertVO.java index 4aea17d83..12b2d1823 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeCertificate; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -20,6 +21,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreCertVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeColor/StoreColorVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeColor/StoreColorVO.java index 1048cc78b..d9168052f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeColor/StoreColorVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeColor/StoreColorVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeColor; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreColorVO { @ApiModelProperty(value = "档口颜色ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java index 4bdd73d32..4c5c24a9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusAddOverPriceVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeCustomer; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreCusAddOverPriceVO { @NotNull(message = "档口ID不能为空!") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusFuzzyResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusFuzzyResVO.java index f14506e30..c33833592 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusFuzzyResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusFuzzyResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeCustomer; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; @@ -11,6 +12,7 @@ import lombok.experimental.Accessors; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Builder @Accessors(chain = true) public class StoreCusFuzzyResVO { 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 ffc90e927..1816209f0 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,7 @@ 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; @@ -12,6 +13,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreCusGeneralSaleVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusPageVO.java index 075361ea0..083a243e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCustomer/StoreCusPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeCustomer; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreCusPageVO extends BasePageVO { @ApiModelProperty(value = "客户名称") 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 7d04f70bf..c41d8cdf9 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,7 @@ 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,6 +15,7 @@ import javax.validation.constraints.Pattern; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreCusVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryPageVO.java index 6fc70b94b..213f93b4a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeFactory/StoreFactoryPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeFactory; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreFactoryPageVO extends BasePageVO { @ApiModelProperty(value = "工厂名称") 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 e65544f4a..8337da8b8 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,7 @@ 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; @@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreFactoryVO { 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 ba828528f..d6df40945 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,7 @@ 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; @@ -13,6 +14,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreHomeDecorationVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateFiveResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateFiveResVO.java index b5178167b..056957077 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateFiveResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateFiveResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeHomepage; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreHomeTemplateFiveResVO { @ApiModelProperty(value = "顶部左侧轮播图") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateTwoResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateTwoResVO.java index de6f70b5d..10243a8fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateTwoResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateTwoResVO.java @@ -27,6 +27,7 @@ public class StoreHomeTemplateTwoResVO { List newProdList; @Data + @ApiModel public static class SHTOTopBannerVO { @ApiModelProperty(value = "1.不跳转 为null 2.跳转店铺 为storeId 3.跳转商品 为storeProdId") private Long bizId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeMember/StoreMemberCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeMember/StoreMemberCreateVO.java index 8e6749753..52c460bf7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeMember/StoreMemberCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeMember/StoreMemberCreateVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeMember; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreMemberCreateVO { @@ -23,7 +25,7 @@ public class StoreMemberCreateVO { @ApiModelProperty(value = "支付金额", required = true) private BigDecimal payPrice; @NotNull(message = "交易密码不能为空!") - @ApiModelProperty(value = "交易密码") + @ApiModelProperty(value = "交易密码", required = true) private String transactionPassword; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorResVO.java index d63a6d657..27aff85c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProdColorResVO.java @@ -1,9 +1,9 @@ package com.ruoyi.web.controller.xkt.vo.storePordColor; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.Valid; import java.math.BigDecimal; /** @@ -12,6 +12,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdColorResVO { @ApiModelProperty(value = "档口商品当前颜色ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java index b25f39de1..c25039655 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdAppResVO.java @@ -49,6 +49,7 @@ public class StoreProdAppResVO { private String detail; @Data + @ApiModel public static class StoreProdFileVO { @ApiModelProperty(value = "文件名称") private String fileName; @@ -63,6 +64,7 @@ public class StoreProdAppResVO { } @Data + @ApiModel public static class StoreProdCateAttrVO { @ApiModelProperty(value = "帮面材质") private String upperMaterial; @@ -109,6 +111,7 @@ public class StoreProdAppResVO { } @Data + @ApiModel public static class StoreProdColorPriceVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeColorId; @@ -117,6 +120,7 @@ public class StoreProdAppResVO { } @Data + @ApiModel public static class StoreProdSvcVO { @ApiModelProperty(value = "大小码及定制款可退") private String customRefund; 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 373c9bf41..591fdb30b 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 @@ -3,6 +3,7 @@ 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; import lombok.AllArgsConstructor; import lombok.Data; @@ -22,6 +23,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdCreateVO { @@ -92,10 +94,9 @@ public class StoreProdCreateVO { @ApiModelProperty(value = "档口生产工艺") private StoreProdProcessVO process; - - @Data @Valid + @ApiModel public static class SPCColorPriceVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeColorId; @@ -113,6 +114,7 @@ public class StoreProdCreateVO { @Data @Valid + @ApiModel public static class StoreProdFileVO { @NotBlank(message = "文件名称不能为空!") @ApiModelProperty(value = "文件名称", required = true) @@ -132,6 +134,7 @@ public class StoreProdCreateVO { } @Data + @ApiModel public static class StoreProdCateAttrVO { @NotBlank(message = "帮面材质不可为空!") @ApiModelProperty(value = "帮面材质", required = true) @@ -184,6 +187,7 @@ public class StoreProdCreateVO { @AllArgsConstructor @NoArgsConstructor @Valid + @ApiModel public static class SPCSizeVO { @ApiModelProperty(value = "商品尺码", required = true) @NotNull(message = "档口商品定价不能为空!") @@ -194,6 +198,7 @@ public class StoreProdCreateVO { } @Data + @ApiModel public static class StoreProdSvcVO { @ApiModelProperty(value = "大小码及定制款可退") private String customRefund; @@ -206,6 +211,7 @@ public class StoreProdCreateVO { } @Data + @ApiModel public static class StoreProdProcessVO { @ApiModelProperty(value = "鞋型") private String shoeType; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyColorResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyColorResVO.java index 11e13ac5a..3e9dc1cba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyColorResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyColorResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; @@ -14,6 +15,7 @@ import java.util.List; */ @Data @Builder +@ApiModel @Accessors(chain = true) public class StoreProdFuzzyColorResVO { @@ -27,6 +29,7 @@ public class StoreProdFuzzyColorResVO { private List colorList; @Data + @ApiModel public static class SPFCColorVO { @ApiModelProperty(value = "档口颜色ID") private Long storeColorId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResPicVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResPicVO.java index 994734844..c4c13b6bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResPicVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdFuzzyResPicVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; @@ -12,6 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Builder +@ApiModel @Accessors(chain = true) public class StoreProdFuzzyResPicVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java index b62efdfc7..906c2a2ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java @@ -41,6 +41,7 @@ public class StoreProdPCResVO { private List fileList; @Data + @ApiModel public static class SPPCColorVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeProdColorId; @@ -57,6 +58,7 @@ public class StoreProdPCResVO { } @Data + @ApiModel public static class SPPCSizeStockVO { @ApiModelProperty(value = "档口商品颜色尺码ID") private Long storeProdColorSizeId; @@ -69,6 +71,7 @@ public class StoreProdPCResVO { } @Data + @ApiModel public static class StoreProdFileVO { @ApiModelProperty(value = "文件名称") private String fileName; @@ -83,6 +86,7 @@ public class StoreProdPCResVO { } @Data + @ApiModel public static class StoreProdCateAttrVO { @ApiModelProperty(value = "帮面材质") private String upperMaterial; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageResVO.java index d001a6146..f5656bf93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdPageResVO { @ApiModelProperty(value = "档口商品主图url") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java index fa4e2251e..ff5e269d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreProdPageVO extends BasePageVO { @ApiModelProperty(value = "商品货号") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPicSpaceResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPicSpaceResVO.java index 649daa24e..7182a59ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPicSpaceResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPicSpaceResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.ruoyi.web.controller.xkt.vo.storeProductFile.StoreProdFilePicSpaceResVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdPicSpaceResVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java index 6514bdf1f..95c234e84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java @@ -2,14 +2,13 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.web.controller.xkt.vo.storeColor.StoreColorVO; -import com.ruoyi.xkt.dto.storeProdColorSize.StoreProdColorSizeDTO; +import io.swagger.annotations.ApiModel; 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 java.math.BigDecimal; import java.util.Date; @@ -21,6 +20,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdResVO { @ApiModelProperty(value = "档口商品名称") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java index 7ec8fc969..c92a40cb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java @@ -28,6 +28,7 @@ public class StoreProdSkuResVO { private List colorList; @Data + @ApiModel public static class SPColorVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeProdColorId; @@ -45,6 +46,7 @@ public class StoreProdSkuResVO { @Data + @ApiModel public static class SPSizeStockVO { @ApiModelProperty(value = "档口商品颜色尺码ID") private Long storeProdColorSizeId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateCountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateCountResVO.java index 9c00e5775..a33d983c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateCountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateCountResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdStatusCateCountResVO { @ApiModelProperty(value = "商品状态") @@ -20,6 +22,7 @@ public class StoreProdStatusCateCountResVO { List cateCountList; @Data + @ApiModel @Accessors(chain = true) public static class SPSCCCateCountVO { @ApiModelProperty(value = "商品分类ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateNumVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateNumVO.java index 0fd3d799a..cf1e3f8be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateNumVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusCateNumVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,12 +13,13 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdStatusCateNumVO { @NotNull(message = "档口ID不能为空!") @ApiModelProperty(value = "档口ID", required = true) private Long storeId; - @ApiModelProperty(value = "商品状态列表") + @ApiModelProperty(value = "商品状态列表", required = true) @NotNull(message = "商品状态列表不能为空!") List prodStatusList; 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 9771e40f3..a526b4832 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,7 @@ 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; @@ -10,6 +11,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdStatusCountResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusVO.java index ea3992ae1..0efbf2bf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdStatusVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdStatusVO { @NotNull(message = "档口ID不能为空!") 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 a1ea91e87..9bbc218be 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 @@ -3,6 +3,7 @@ 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; import lombok.AllArgsConstructor; import lombok.Data; @@ -22,6 +23,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdUpdateVO { @@ -94,9 +96,9 @@ public class StoreProdUpdateVO { private StoreProdProcessVO process; - @Data @Valid + @ApiModel public static class SPCColorPriceVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeColorId; @@ -114,6 +116,7 @@ public class StoreProdUpdateVO { @Data @Valid + @ApiModel public static class StoreProdFileVO { @NotBlank(message = "文件名称不能为空!") @ApiModelProperty(value = "文件名称", required = true) @@ -133,6 +136,7 @@ public class StoreProdUpdateVO { } @Data + @ApiModel public static class StoreProdCateAttrVO { @NotBlank(message = "帮面材质不可为空!") @ApiModelProperty(value = "帮面材质", required = true) @@ -185,6 +189,7 @@ public class StoreProdUpdateVO { @AllArgsConstructor @NoArgsConstructor @Valid + @ApiModel public static class SPCSizeVO { @ApiModelProperty(value = "商品尺码", required = true) @NotNull(message = "档口商品定价不能为空!") @@ -195,6 +200,7 @@ public class StoreProdUpdateVO { } @Data + @ApiModel public static class StoreProdSvcVO { @ApiModelProperty(value = "大小码及定制款可退") private String customRefund; @@ -207,6 +213,7 @@ public class StoreProdUpdateVO { } @Data + @ApiModel public static class StoreProdProcessVO { @ApiModelProperty(value = "鞋型") private String shoeType; 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 74d059330..429c5450e 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 @@ -3,6 +3,7 @@ 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; import lombok.AllArgsConstructor; import lombok.Data; @@ -22,6 +23,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdVO { @@ -95,6 +97,7 @@ public class StoreProdVO { @Data @Valid + @ApiModel public static class SPCColorPriceVO { @ApiModelProperty(value = "档口商品颜色ID") private Long storeColorId; @@ -112,6 +115,7 @@ public class StoreProdVO { @Data @Valid + @ApiModel public static class StoreProdFileVO { @NotBlank(message = "文件名称不能为空!") @ApiModelProperty(value = "文件名称", required = true) @@ -131,6 +135,7 @@ public class StoreProdVO { } @Data + @ApiModel public static class StoreProdCateAttrVO { @NotBlank(message = "帮面材质不可为空!") @ApiModelProperty(value = "帮面材质", required = true) @@ -183,6 +188,7 @@ public class StoreProdVO { @AllArgsConstructor @NoArgsConstructor @Valid + @ApiModel public static class SPCSizeVO { @ApiModelProperty(value = "商品尺码", required = true) @NotNull(message = "档口商品定价不能为空!") @@ -193,6 +199,7 @@ public class StoreProdVO { } @Data + @ApiModel public static class StoreProdSvcVO { @ApiModelProperty(value = "大小码及定制款可退") private String customRefund; @@ -205,6 +212,7 @@ public class StoreProdVO { } @Data + @ApiModel public static class StoreProdProcessVO { @ApiModelProperty(value = "鞋型") private String shoeType; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdViewVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdViewVO.java index a1aa2d87f..283af3955 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdViewVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdViewVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProd; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdViewVO { @ApiModelProperty(value = "会员等级") @@ -36,7 +38,5 @@ public class StoreProdViewVO { private Long storeId; @ApiModelProperty(value = "档口名称") private String storeName; -// @ApiModelProperty(value = "档口标签列表") -// private List storeTagList; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java index 0f85073d8..33c630de0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdBarcodeMatch/BarcodeMatchVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProdBarcodeMatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,6 +14,7 @@ import java.util.List; * @version v1.0 * @date 2025/3/27 15:12 */ +@ApiModel @Data public class BarcodeMatchVO { @@ -28,6 +30,7 @@ public class BarcodeMatchVO { List colorList; @Data + @ApiModel public static class BarcodeMatchColorVO { @NotNull(message = "颜色ID不能为空") @ApiModelProperty(value = "档口颜色ID", required = true) @@ -39,6 +42,7 @@ public class BarcodeMatchVO { } @Data + @ApiModel public static class BarcodeMatchSizeVO { @NotNull(message = "尺码不能为空") @ApiModelProperty(value = "尺码", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPricePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPricePageVO.java index 25cc833d5..f220ac264 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPricePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdColorPrice/StoreProdColorPricePageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProdColorPrice; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,6 +16,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreProdColorPricePageVO extends BasePageVO { @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 26bf3fd07..64182ec90 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 @@ -25,6 +25,7 @@ public class StorePrintSnResVO { private List sizeSnList; @Data + @ApiModel @Accessors(chain = true) public static class SPSizeSnVO { @ApiModelProperty(value = "尺码") 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 4756a5e39..ccc1680be 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 @@ -29,6 +29,7 @@ public class StorePrintSnVO { private List colorSizeList; @Data + @ApiModel @Accessors(chain = true) public static class SPColorSizeVO { @NotNull(message = "档口商品颜色ID不能为空!") @@ -47,6 +48,7 @@ public class StorePrintSnVO { } @Data + @ApiModel @Accessors(chain = true) public static class SPSizeVO { @NotNull(message = "尺码不能为空!") 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 aa8b7aa85..93a2f1a13 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 @@ -25,6 +25,7 @@ public class StoreSaleSnResVO { List successList; @Data + @ApiModel @Accessors(chain = true) public static class SPSDetailVO { @ApiModelProperty(value = "档口商品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 7932f01eb..791731cf0 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 @@ -25,6 +25,7 @@ public class StoreStockTakingSnResVO { List successList; @Data + @ApiModel @Accessors(chain = true) public static class SSTSDetailVO { @ApiModelProperty(value = "档口商品颜色尺码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 139ae6248..2de16bdb4 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 @@ -15,7 +15,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data -@ApiModel(value="档口入库扫码返回数据") +@ApiModel(value = "档口入库扫码返回数据") @Accessors(chain = true) @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreStorageSnResVO { @@ -26,6 +26,7 @@ public class StoreStorageSnResVO { List successList; @Data + @ApiModel @Accessors(chain = true) public static class SSSDetailVO { @ApiModelProperty(value = "档口商品颜色尺码ID") @@ -45,6 +46,7 @@ public class StoreStorageSnResVO { } @Data + @ApiModel @Accessors(chain = true) public static class SSSSizeCountVO { @ApiModelProperty(value = "尺码") 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 7fcc24278..0c4ce3fb7 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 @@ -20,20 +20,21 @@ import java.util.List; public class StoreProdCheckStockVO { @NotNull(message = "档口商品颜色的库存不能为空") - @ApiModelProperty(value = "档口商品颜色的库存") + @ApiModelProperty(value = "档口商品颜色的库存", required = true) List checkStockList; @Data @Valid + @ApiModel public static class SPCSStockVO { @NotNull(message = "档口商品颜色ID不能为空") - @ApiModelProperty(value = "档口商品颜色ID") + @ApiModelProperty(value = "档口商品颜色ID", required = true) private Long storeProdColorId; @NotNull(message = "盘点库存不能为空") - @ApiModelProperty(value = "尺码尺码") + @ApiModelProperty(value = "尺码尺码", required = true) private Integer size; @NotNull(message = "盘点库存不能为空") - @ApiModelProperty(value = "盘点库存") + @ApiModelProperty(value = "盘点库存", required = true) private Integer stock; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountResVO.java index 828eb05ea..0cd28372e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockAndDiscountResVO.java @@ -44,6 +44,7 @@ public class StoreProdStockAndDiscountResVO { private List sizeStockList; @Data + @ApiModel public static class SPSADSizeVO { @ApiModelProperty(value = "尺码") private Integer size; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java index 7dbf6d182..a6cd88351 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,13 +13,14 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdStockClearZeroVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空") private Long storeId; @NotNull(message = "商品库存ID列表不能为空") - @ApiModelProperty(value = "商品库存ID列表") + @ApiModelProperty(value = "商品库存ID列表", required = true) private List storeProdStockIdList; } 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 77f0513d3..c37bb60d0 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,7 @@ 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; @@ -13,11 +14,12 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdStockExportVO { @NotNull(message = "storeId不能为空!") - @ApiModelProperty(value = "storeId") + @ApiModelProperty(value = "storeId", required = true) private Long storeId; @ApiModelProperty(value = "storeProdStockIdList") private List storeProdStockIdList; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockPageVO.java index 8d9032da9..e9b766e88 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockPageVO.java @@ -1,12 +1,11 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotNull; - /** * @author liujiang * @version v1.0 @@ -14,6 +13,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreProdStockPageVO extends BasePageVO { @ApiModelProperty(value = "商品货号") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java index 2e3f957dc..1667cbd0c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProdStock; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -10,6 +11,7 @@ import lombok.experimental.Accessors; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreProdStockResVO { 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 37ea3193b..ccf269e91 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,7 @@ 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; @@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdStockVO { 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 d6e59866a..0417586f8 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 @@ -3,6 +3,7 @@ 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; import lombok.Data; import lombok.experimental.Accessors; @@ -17,6 +18,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) @Accessors(chain = true) public class StoreProdStorageResVO { @@ -43,6 +45,7 @@ public class StoreProdStorageResVO { private List detailList; @Data + @ApiModel public static class StorageDetailVO { @ApiModelProperty(value = "商品货号") 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 233f4103b..c89a6a68b 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 @@ -35,6 +35,7 @@ public class StoreProdStorageVO { private List detailList; @Data + @ApiModel public static class StorageDetailVO { @NotBlank(message = "商品货号不能为空!") 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 5d24d1624..d975722bd 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,7 @@ 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; @@ -14,11 +15,12 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreStorageExportVO { @NotNull(message = "storeId不能为空!") - @ApiModelProperty(value = "storeId") + @ApiModelProperty(value = "storeId", required = true) private Long storeId; @ApiModelProperty(value = "storeProdStorageId") private List storeProdStorageIdList; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandDeleteVO.java index 69abb22b1..f29a6b900 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandDeleteVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandDeleteVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdDemandDeleteVO { @ApiModelProperty(value = "档口ID", required = true) 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 f3634a0e4..b1f14f844 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,7 @@ 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; @@ -13,6 +14,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdDemandExportVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandFinishAllVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandFinishAllVO.java index 8ec11e127..717171196 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandFinishAllVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandFinishAllVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdDemandFinishAllVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageResVO.java index 13d2216f8..33f6f207d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreProdDemandPageResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageVO.java index 822a21243..eea589364 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreProdDemandPageVO extends BasePageVO { @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 527d3f277..ea238c523 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,7 @@ 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; @@ -10,6 +11,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdDemandStatusCountResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java index dbb7c039e..21f3e8925 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java @@ -30,6 +30,7 @@ public class StoreProdDemandVO { private List detailList; @Data + @ApiModel public static class DetailVO { @NotNull(message = "档口商品ID不能为空") @ApiModelProperty(value = "档口商品ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyResVO.java index d0d13dea7..7e34e6cf2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdDemandVerifyResVO { @ApiModelProperty(value = "需求不存在信息列表") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyVO.java index b24b7eabf..4d284acaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVerifyVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +15,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdDemandVerifyVO { @NotNull(message = "档口ID不能为空") @@ -25,6 +27,7 @@ public class StoreProdDemandVerifyVO { private List detailList; @Data + @ApiModel public static class DetailVO { @NotNull(message = "档口商品ID不能为空") @ApiModelProperty(value = "档口商品ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandWorkingVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandWorkingVO.java index 2fc71746d..83231bf2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandWorkingVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandWorkingVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductDemand; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class StoreProdDemandWorkingVO { @ApiModelProperty(value = "档口ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFilePicSpaceResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFilePicSpaceResVO.java index 6757a5090..7e90df585 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFilePicSpaceResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductFile/StoreProdFilePicSpaceResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeProductFile; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; @@ -10,6 +11,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Builder public class StoreProdFilePicSpaceResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductStorageDemandDeduct/StoreProdStorageDemandDeductVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductStorageDemandDeduct/StoreProdStorageDemandDeductVO.java index f00d88ddc..1413dd15c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductStorageDemandDeduct/StoreProdStorageDemandDeductVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductStorageDemandDeduct/StoreProdStorageDemandDeductVO.java @@ -37,6 +37,7 @@ public class StoreProdStorageDemandDeductVO { @Data @Accessors(chain = true) + @ApiModel public static class SPSDDDemandDetailVO { @ApiModelProperty("档口入库需求抵扣ID") private Long spsddId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleResVO.java index f029d3cda..09ad89f27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRole/StoreRoleResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeRole; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreRoleResVO { 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 a044d8071..afddc1cca 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,7 @@ 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; @@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreRoleUpdateStatusVO { 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 b296d779f..3049d3858 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 @@ -25,7 +25,7 @@ public class StoreRoleVO { private Long storeId; @ApiModelProperty(value = "档口子角色ID，新增为空 编辑必传") private Long storeRoleId; - @ApiModelProperty(value = "角色名称") + @ApiModelProperty(value = "角色名称", required = true) @NotBlank(message = "角色名称不能为空!") @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字!") private String roleName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccDetailResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccDetailResVO.java index c13aa2b82..ba4b2a686 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccDetailResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccDetailResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreRoleAccDetailResVO { @@ -25,6 +27,7 @@ public class StoreRoleAccDetailResVO { private List roleList; @Data + @ApiModel public static class StoreRoleVO { @ApiModelProperty(value = "档口子角色ID") private Long storeRoleId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccListVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccListVO.java index 746c9827b..89f52665e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccListVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccListVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +15,7 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreRoleAccListVO extends BasePageVO { @NotNull(message = "档口ID不能为空") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccResVO.java index 9d70c1720..2acd471d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeRoleAccount/StoreRoleAccResVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.storeRoleAccount; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class StoreRoleAccResVO { 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 0faaf5c20..5abab2e96 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,7 @@ 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; @@ -13,6 +14,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreRoleAccUpdateStatusVO { 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 c8b2624ae..1ecfc4275 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,7 @@ 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; @@ -13,6 +14,7 @@ import javax.validation.constraints.Size; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreRoleAccUpdateVO { 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 499d66ee1..d775ccc33 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,7 @@ 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,13 +16,14 @@ import javax.validation.constraints.Size; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreRoleAccVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; - @ApiModelProperty(value = "档口子角色ID") + @ApiModelProperty(value = "档口子角色ID", required = true) @NotNull(message = "档口子角色ID不能为空!") private Long storeRoleId; @ApiModelProperty(value = "子账户名称") 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 cdca8a98a..38926d4f6 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 @@ -21,7 +21,7 @@ import java.util.List; public class StoreSaleExportVO { @NotNull(message = "storeId不能为空!") - @ApiModelProperty(value = "storeId") + @ApiModelProperty(value = "storeId", required = true) private Long storeId; @ApiModelProperty(value = "storeSaleIdList") private List storeSaleIdList; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePageVO.java index ce417b76e..02049366c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSalePageVO.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.xkt.vo.storeSale; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,6 +17,7 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreSalePageVO extends BasePageVO { @NotNull(message = "档口ID不能为空") 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 a30f7ff84..f5fcac787 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 @@ -2,6 +2,7 @@ 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; @@ -15,6 +16,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreSaleResVO { @@ -51,6 +53,7 @@ public class StoreSaleResVO { private List detailList; @Data + @ApiModel public static class SaleDetailVO { @ApiModelProperty(value = "档口商品ID") private Long storeProdId; 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 3ef93bdc6..f4cb4a707 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 @@ -20,10 +20,10 @@ import javax.validation.constraints.Size; public class StoreSaleUpdateMemoVO { @NotNull(message = "storeSaleId不能为空!") - @ApiModelProperty(value = "storeSaleId") + @ApiModelProperty(value = "storeSaleId", required = true) private Long storeSaleId; @NotBlank(message = "备注不能为空!") - @ApiModelProperty(value = "备注") + @ApiModelProperty(value = "备注", required = true) @Size(min = 0, max = 100, message = "备注不能超过100字!") private String remark; 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 2f0214404..aa651c703 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 @@ -53,6 +53,7 @@ public class StoreSaleVO { private List detailList; @Data + @ApiModel public static class SaleDetailVO { @NotNull(message = "档口商品ID不能为空!") @ApiModelProperty(value = "档口商品ID", required = true) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthAuditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthAuditVO.java index 729b2e3f5..b1c440f23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthAuditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthAuditVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.userAuthentication; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class UserAuthAuditVO { 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 b43dbbb66..b2559798e 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,7 @@ 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; @@ -14,6 +15,7 @@ import java.math.BigDecimal; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class UserAuthCreateVO { @@ -34,15 +36,16 @@ public class UserAuthCreateVO { private UACFileDTO emblemFile; @Data + @ApiModel public static class UACFileDTO { @NotBlank(message = "文件名称不能为空") - @ApiModelProperty(value = "文件名称") + @ApiModelProperty(value = "文件名称", required = true) private String fileName; @NotBlank(message = "文件路径不能为空") - @ApiModelProperty(value = "文件路径") + @ApiModelProperty(value = "文件路径", required = true) private String fileUrl; @NotNull(message = "文件大小不能为空") - @ApiModelProperty(value = "文件大小") + @ApiModelProperty(value = "文件大小", required = true) private BigDecimal fileSize; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthPageVO.java index 1c697a209..43442e44f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.userAuthentication; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class UserAuthPageVO extends BasePageVO { @ApiModelProperty(value = "真实名称") 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 35bd00691..5c514181f 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,7 @@ 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; @@ -10,6 +11,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class UserAuthResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateDelFlagVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateDelFlagVO.java index 4ec5ef888..57b32a7cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateDelFlagVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userAuthentication/UserAuthUpdateDelFlagVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.userAuthentication; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import javax.validation.constraints.NotNull; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class UserAuthUpdateDelFlagVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userBrowsingHistory/UserBrowHisPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userBrowsingHistory/UserBrowHisPageVO.java index a9be5789e..9f663dcac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userBrowsingHistory/UserBrowHisPageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userBrowsingHistory/UserBrowHisPageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.userBrowsingHistory; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class UserBrowHisPageVO extends BasePageVO { 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 c3e27031f..a73a6508d 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 @@ -26,6 +26,7 @@ public class UserFavBatchAddToShopCartVO { List batchList; @Data + @ApiModel public static class BatchVO { @NotBlank(message = "商品货号不能为空!") @ApiModelProperty(value = "商品货号", required = true) 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 4fc586481..b73ca0904 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 @@ -19,7 +19,7 @@ import java.util.List; public class UserFavBatchDeleteVO { @NotNull(message = "档口商品ID列表不能为空!") - @ApiModelProperty("档口商品ID列表") + @ApiModelProperty(value = "档口商品ID列表", required = true) List storeProdIdList; 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 b5c52ea12..458622f92 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 @@ -2,6 +2,7 @@ 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; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,11 +17,12 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class UserFavoritePageVO extends BasePageVO { @NotNull(message = "商品状态不可为空!") - @ApiModelProperty(value = "商品状态，在售传：2， 已失效传：4,5") + @ApiModelProperty(value = "商品状态，在售传：2， 已失效传：4,5", required = true) private List statusList; @ApiModelProperty(value = "商品货号") private String prodArtNum; 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 59f66317b..b394bd430 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,7 @@ 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; import lombok.experimental.Accessors; @@ -15,6 +16,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class UserFavoriteVO { @@ -24,12 +26,13 @@ public class UserFavoriteVO { @Data @Accessors(chain = true) @Valid + @ApiModel public static class UFBatchVO { @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @NotNull(message = "档口商品ID不能为空!") - @ApiModelProperty(value = "档口商品ID") + @ApiModelProperty(value = "档口商品ID", required = true) private Long storeProdId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userIndex/UserOverallResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userIndex/UserOverallResVO.java index 7c72fbef7..8e3977001 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userIndex/UserOverallResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userIndex/UserOverallResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.userIndex; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel public class UserOverallResVO { @ApiModelProperty(value = "图搜热款数量") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppListResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppListResVO.java index 76432513e..a7bc02b5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppListResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppListResVO.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.xkt.vo.userNotice; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -12,6 +13,7 @@ import java.util.Date; * @date 2025/3/27 15:12 */ @Data +@ApiModel @Accessors(chain = true) public class UserNoticeAppListResVO { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppTypePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppTypePageVO.java index c949906c1..9be17749f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppTypePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticeAppTypePageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.userNotice; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,10 +15,11 @@ import javax.validation.constraints.NotNull; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class UserNoticeAppTypePageVO extends BasePageVO { @NotNull(message = "消息接收类型不能为空") - @ApiModelProperty(value = "消息接收类型") + @ApiModelProperty(value = "消息接收类型", required = true) private Integer targetNoticeType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticePageVO.java index b96d59d81..d0c334446 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userNotice/UserNoticePageVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.userNotice; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class UserNoticePageVO extends BasePageVO { @ApiModelProperty(value = "公告标题") 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 7b05d82f8..f55fef27a 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 @@ -19,7 +19,7 @@ import java.util.List; public class ShopCartDeleteVO { @NotNull(message = "进货车ID列表不可为空!") - @ApiModelProperty(value = "进货车ID列表") + @ApiModelProperty(value = "进货车ID列表", required = true) private List shoppingCartIdList; } 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 9ab167dd0..223aed921 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,7 @@ 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; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class ShopCartEditDetailResVO { @@ -31,6 +33,7 @@ public class ShopCartEditDetailResVO { List detailList; @Data + @ApiModel @Accessors(chain = true) public static class SCDDetailVO { @ApiModelProperty(value = "档口商品颜色ID") @@ -42,6 +45,7 @@ public class ShopCartEditDetailResVO { } @Data + @ApiModel @Accessors(chain = true) public static class StoreProdColorVO { @ApiModelProperty(value = "档口商品颜色ID") @@ -59,6 +63,7 @@ public class ShopCartEditDetailResVO { } @Data + @ApiModel @Accessors(chain = true) public static class StoreProdSizeStockVO { @ApiModelProperty(value = "商品尺码") 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 def655011..65af62a20 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,7 @@ 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,42 +16,44 @@ import java.util.List; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class ShopCartEditVO { - @ApiModelProperty(value = "进货车ID, 新增不传，编辑必传") + @ApiModelProperty(value = "进货车ID, 新增不传，编辑必传", required = true) @NotNull(message = "进货车ID不能为空!") private Long shoppingCartId; @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @NotNull(message = "档口商品ID不能为空!") - @ApiModelProperty(value = "档口商品ID") + @ApiModelProperty(value = "档口商品ID", required = true) private Long storeProdId; @NotBlank(message = "商品货号不能为空!") - @ApiModelProperty(value = "商品货号") + @ApiModelProperty(value = "商品货号", required = true) private String prodArtNum; @Valid @NotNull(message = "进货车明细列表不能为空!") - @ApiModelProperty(value = "进货车明细列表") + @ApiModelProperty(value = "进货车明细列表", required = true) List detailList; @Data + @ApiModel public static class SCDetailVO { @NotNull(message = "档口商品颜色ID不能为空!") - @ApiModelProperty(value = "档口商品颜色ID") + @ApiModelProperty(value = "档口商品颜色ID", required = true) private Long storeProdColorId; @NotNull(message = "尺码不能为空!") - @ApiModelProperty(value = "尺码") + @ApiModelProperty(value = "尺码", required = true) private Integer size; @NotNull(message = "档口商品颜色ID不能为空!") - @ApiModelProperty(value = "档口商品颜色ID") + @ApiModelProperty(value = "档口商品颜色ID", required = true) private Long storeColorId; @NotBlank(message = "颜色名称不能为空!") - @ApiModelProperty(value = "颜色名称") + @ApiModelProperty(value = "颜色名称", required = true) private String colorName; @NotNull(message = "商品数量不能为空!") - @ApiModelProperty(value = "商品数量") + @ApiModelProperty(value = "商品数量", required = true) private Integer quantity; } 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 27183bc22..d8398f1c6 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 @@ -19,7 +19,7 @@ import java.util.List; public class ShopCartListVO { @NotNull(message = "档口商品ID列表不可为空!") - @ApiModelProperty(value = "档口商品ID列表") + @ApiModelProperty(value = "档口商品ID列表", required = true) private List storeProdIdList; } 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 00c8209dd..4ace74e08 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 @@ -22,7 +22,7 @@ import java.util.List; public class ShopCartPageVO extends BasePageVO { @NotNull(message = "商品状态不可为空!") - @ApiModelProperty(value = "商品状态，在售传：2， 已失效传：4,5") + @ApiModelProperty(value = "商品状态，在售传：2， 已失效传：4,5", required = true) private List statusList; @ApiModelProperty(value = "商品货号") private String prodArtNum; 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 1530ed7d8..0de07b834 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 @@ -32,6 +32,7 @@ public class ShopCartResVO { List detailList; @Data + @ApiModel public static class SCDetailVO { @ApiModelProperty(value = "档口商品颜色尺寸ID") private Long storeProdColorSizeId; 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 420261bc8..13ab95b05 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,7 @@ 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; @@ -10,6 +11,7 @@ import lombok.Data; * @date 2025/3/27 15:12 */ @Data +@ApiModel @JsonInclude(JsonInclude.Include.NON_NULL) public class ShopCartStatusCountResVO { 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 536f382f6..b2233e999 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 @@ -33,6 +33,7 @@ public class ShopCartToOrderResVO { List detailList; @Data + @ApiModel @Accessors(chain = true) public static class SCDDetailVO { @ApiModelProperty(value = "档口商品颜色ID") @@ -44,6 +45,7 @@ public class ShopCartToOrderResVO { } @Data + @ApiModel @Accessors(chain = true) public static class StoreProdColorVO { @ApiModelProperty(value = "档口商品颜色ID") @@ -61,6 +63,7 @@ public class ShopCartToOrderResVO { } @Data + @ApiModel @Accessors(chain = true) public static class StoreProdSizeStockVO { @ApiModelProperty(value = "商品尺码") 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 62597f0ae..2b676c664 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 @@ -21,35 +21,36 @@ import java.util.List; public class ShopCartVO { @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @NotNull(message = "档口商品ID不能为空!") - @ApiModelProperty(value = "档口商品ID") + @ApiModelProperty(value = "档口商品ID", required = true) private Long storeProdId; @NotBlank(message = "商品货号不能为空!") - @ApiModelProperty(value = "商品货号") + @ApiModelProperty(value = "商品货号", required = true) private String prodArtNum; @Valid @NotNull(message = "进货车明细列表不能为空!") - @ApiModelProperty(value = "进货车明细列表") + @ApiModelProperty(value = "进货车明细列表", required = true) List detailList; @Data + @ApiModel public static class SCDetailVO { @NotNull(message = "档口商品颜色ID不能为空!") - @ApiModelProperty(value = "档口商品颜色ID") + @ApiModelProperty(value = "档口商品颜色ID", required = true) private Long storeProdColorId; @NotNull(message = "尺码不能为空!") - @ApiModelProperty(value = "尺码") + @ApiModelProperty(value = "尺码", required = true) private Integer size; @NotNull(message = "档口商品颜色ID不能为空!") - @ApiModelProperty(value = "档口商品颜色ID") + @ApiModelProperty(value = "档口商品颜色ID", required = true) private Long storeColorId; @NotBlank(message = "颜色名称不能为空!") - @ApiModelProperty(value = "颜色名称") + @ApiModelProperty(value = "颜色名称", required = true) private String colorName; @NotNull(message = "商品数量不能为空!") - @ApiModelProperty(value = "商品数量") + @ApiModelProperty(value = "商品数量", required = true) private Integer quantity; } 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 aa23d36eb..de3f95a77 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 @@ -19,7 +19,7 @@ import java.util.List; public class UserSubscDeleteVO { @NotNull(message = "档口ID列表不能为空!") - @ApiModelProperty(value = "档口ID列表") + @ApiModelProperty(value = "档口ID列表", required = true) private List storeIdList; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/IndexSearchVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/IndexSearchVO.java index a91ea8b5e..81038085b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/IndexSearchVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/IndexSearchVO.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.xkt.vo.website; import co.elastic.clients.elasticsearch._types.SortOrder; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,6 +17,7 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class IndexSearchVO extends BasePageVO { @ApiModelProperty(value = "档口ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/StoreSearchVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/StoreSearchVO.java index fdfb5358d..0154f5a82 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/StoreSearchVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/website/StoreSearchVO.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.xkt.vo.website; import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data +@ApiModel public class StoreSearchVO extends BasePageVO { @ApiModelProperty(value = "档口名称")