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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * @auther lyq
@@ -93,7 +93,7 @@
    private Date createAt;

    /**
     * 接种用户类型（1.小程序用户  2.家庭成员用户
     * 接种用户类型（1.小程序用户 2.家庭成员用户
     */
    private Long userType;

@@ -104,21 +104,9 @@

    @Override
    public String toString() {
        return "ComMngVaccinesInoculationRecordDO{" +
                "id=" + id +
                ", vaccines=" + vaccines +
                ", userId=" + userId +
                ", name=" + name +
                ", sex=" + sex +
                ", age=" + age +
                ", phone=" + phone +
                ", idCard=" + idCard +
                ", dosage=" + dosage +
                ", vaccinesCode=" + vaccinesCode +
                ", medicalInstitution=" + medicalInstitution +
                ", remark=" + remark +
                ", inoculationAt=" + inoculationAt +
                ", createAt=" + createAt +
                "}";
        return "ComMngVaccinesInoculationRecordDO{" + "id=" + id + ", vaccines=" + vaccines + ", userId=" + userId
            + ", name=" + name + ", sex=" + sex + ", age=" + age + ", phone=" + phone + ", idCard=" + idCard
            + ", dosage=" + dosage + ", vaccinesCode=" + vaccinesCode + ", medicalInstitution=" + medicalInstitution
            + ", remark=" + remark + ", inoculationAt=" + inoculationAt + ", createAt=" + createAt + "}";
    }
}