From 36f760b1a039da26060c5ab2807a9c6a73f76b43 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 19 Sep 2023 10:02:13 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 2 +-
1 files changed, 1 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..012f7be 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) {
--
Gitblit v1.9.1