From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 5391a6a..6dac51e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -1,6 +1,9 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -34,6 +37,7 @@
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
@ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="商品数量")
@@ -62,4 +66,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
+ @ApiModelProperty(value = "查询关键字", hidden = true)
+ @JsonIgnore
+ private String keyword;
+
+
}
--
Gitblit v1.7.1