Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDiagnosisDO.java

@@ -2,8 +2,7 @@ package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -46,7 +45,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
    private Date createTime;
    @Column(name = "prescription_id")
    //@Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
@@ -54,7 +53,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
        this.prescriptionId = prescriptionId;
    }
    @Column(name = "code")
    //@Column(name = "code")
    public String getCode() {
        return code;
    }
@@ -63,7 +62,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
        this.code = code;
    }
    @Column(name = "name")
    //@Column(name = "name")
    public String getName() {
        return name;
    }
@@ -71,7 +70,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
        this.name = name;
    }
    @Column(name = "type")
    //@Column(name = "type")
    public Integer getType() {
        return type;
    }
@@ -79,7 +78,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
        this.type = type;
    }
    @Column(name = "create_time")
    //@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }