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/CapitalPageVO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @auther llming
@@ -25,7 +25,7 @@
    @ApiModelProperty("支付方式（1.微信支付）")
    private Integer payType;
    @ApiModelProperty("类型")
    private String type="订单收入";
    private String type = "订单收入";
    @ApiModelProperty("支付时间")
    private Date payTime;
}