From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java
index a75660f..84c0a67 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFundsOrderVO.java
@@ -1,23 +1,18 @@
package com.panzhihua.common.model.vos.shop;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.panzhihua.common.model.helper.SerializerBigDecimal;
+import java.math.BigDecimal;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
@Data
@ApiModel("商户资金订单信息")
public class ComShopFundsOrderVO {
@ApiModelProperty("金额")
- //@JsonFormat(pattern = "0.00", shape = JsonFormat.Shape.STRING)
- //@JsonSerialize(using = SerializerBigDecimal.class)
+ // @JsonFormat(pattern = "0.00", shape = JsonFormat.Shape.STRING)
+ // @JsonSerialize(using = SerializerBigDecimal.class)
private BigDecimal totalAmount;
@ApiModelProperty("支付时间")
@@ -34,6 +29,5 @@
@ApiModelProperty("订单ID")
private long id;
-
}
--
Gitblit v1.7.1