From 93dbacbd82ffbcafc902adc0ee83b964beee4cd9 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 12 Apr 2025 20:19:19 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=BE=AE=E8=B0=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/xkt/StoreHomepageController.java | 1 - .../web/controller/xkt/StoreSaleRefundRecordController.java | 2 ++ .../src/main/java/com/ruoyi/system/domain/SysNotice.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java index fc91464a2..b6c8ad844 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java @@ -85,5 +85,4 @@ public class StoreHomepageController extends XktBaseController { return R.ok(BeanUtil.toBean(storeHomeService.getStoreProdInfo(storeId, storeProdId), StoreHomeProdResVO.class)); } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java index 2bd87a225..91afed679 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreSaleRefundRecordController.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.web.controller.xkt.vo.storeSaleRefundRecord.StoreSaleRefundRecordVO; import com.ruoyi.xkt.dto.storeSaleRefundRecord.StoreSaleRefundRecordDTO; import com.ruoyi.xkt.service.IStoreSaleRefundRecordService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; @@ -22,6 +23,7 @@ import java.util.List; * @author ruoyi * @date 2025-03-26 */ +@Api(tags = "档口销售返单") @RestController @RequiredArgsConstructor @RequestMapping("/rest/v1/sale-refund-records") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index f676c7aad..5418ffc2a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -63,6 +63,8 @@ public class SysNotice extends XktBaseEntity { */ private String status; + private String remark; + @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")