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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderPayDO.java

@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -42,7 +42,7 @@
    private String wxTradeNo;

    /**
     * 支付状态（1.未支付  2.已支付）
     * 支付状态（1.未支付 2.已支付）
     */
    private Integer payStatus;

@@ -73,27 +73,18 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    @Override
    public String toString() {
        return "ComShopOrderPayDO{" + "id=" + id + ", orderNo=" + orderNo + ", payNo=" + payNo + ", wxTradeNo="
            + wxTradeNo + ", payStatus=" + payStatus + ", orderAmount=" + orderAmount + ", payAmount=" + payAmount
            + ", payTime=" + payTime + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
    }

    /**
     * 支付状态(1.未支付 2.已支付)
     */
    public interface payStatus{
    public interface payStatus {
        int no = 1;
        int yes = 2;
    }

    @Override
    public String toString() {
        return "ComShopOrderPayDO{" +
                "id=" + id +
                ", orderNo=" + orderNo +
                ", payNo=" + payNo +
                ", wxTradeNo=" + wxTradeNo +
                ", payStatus=" + payStatus +
                ", orderAmount=" + orderAmount +
                ", payAmount=" + payAmount +
                ", payTime=" + payTime +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}