diff --git a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java index 42b0e55..96444c6 100644 --- a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java +++ b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java @@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.*; import com.srs.common.core.domain.BaseEntity; +import java.util.List; + /** * 保留学籍申请附件(入伍通知书等)对象 rt_enlistment_reserve_attach @@ -95,5 +97,10 @@ public class RtEnlistmentReserveAttach extends BaseEntity { @Excel(name = "学号") private String studentNo; - + /** + * 入伍保留学籍申请表 + */ + @ApiModelProperty(value = "入伍保留学籍申请表", hidden = true) + @Excel(name = "入伍保留学籍申请表") + private List rtEnlistmentReserves; } diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml index bb2f7ad..31b134d 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml @@ -15,8 +15,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, apply_id,