Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/domain/EntTestPackage.java

@@ -1,12 +1,10 @@
package com.ots.project.exam.domain;

import com.ots.framework.aspectj.lang.annotation.Excel;
import com.ots.framework.web.domain.BaseEntity;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.util.Date;
import java.util.List;

@@ -172,7 +170,11 @@

    private String phonenumber;


    /**
     * 测试者接收报告模板
     * @return
     */
    private String memberTemplate;


    @Override
@@ -193,6 +195,7 @@
                .append("invalidTime", getInvalidTime())
                .append("status", getStatus())
                .append("remark", getRemark())
                .append("memberTemplate", getMemberTemplate())
                .toString();
    }
}