From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法，支持分页和搜索 - 在 AdminActivityController 中添加 list 接口，返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板，根据活动状态控制按钮显示
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index abca442..538eb5d 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -74,7 +74,7 @@
private BigDecimal carriage;
@ApiModelProperty(value = "备注")
- private BigDecimal remark;
+ private String remark;
public Integer getPayMethodType() {
if (this.payMethod == null) {
@@ -124,5 +124,8 @@
private Integer deliveryState;
@ApiModelProperty(value = "是否送货上门 1：是 2：否")
private Integer isHome;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
--
Gitblit v1.9.1