Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 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;


}