Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

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

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

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

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

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -56,6 +56,13 @@
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    @Override
    public String toString() {
        return "ComShopOrderOperateDO{" + "id=" + id + ", orderNo=" + orderNo + ", operationBy=" + operationBy
            + ", operationTime=" + operationTime + ", operationType=" + operationType + ", operationContent="
            + operationContent + ", createAt=" + createAt + "}";
    }

    /**
     * 操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)
     */
@@ -65,18 +72,5 @@
        int pay = 3;
        int deliver = 4;
        int complete = 5;
    }

    @Override
    public String toString() {
        return "ComShopOrderOperateDO{" +
                "id=" + id +
                ", orderNo=" + orderNo +
                ", operationBy=" + operationBy +
                ", operationTime=" + operationTime +
                ", operationType=" + operationType +
                ", operationContent=" + operationContent +
                ", createAt=" + createAt +
                "}";
    }
}