Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 ce0651907f18a57dae80065e01589e975530f53e

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TSamplingRecordVO.java

@@ -12,10 +12,28 @@
@Data
@ApiModel(value = "取样记录VO")
public class TSamplingRecordVO extends TSamplingRecord {
    @ApiModelProperty(value = "项目课题方案")
    private String projectName;

    @ApiModelProperty(value = "实验编号")
    private String experimentCode;

    @ApiModelProperty(value = "实验名称")
    private String experimentName;

    @ApiModelProperty(value = "取样操作记录集合")
    private List<TSamplingRecordOperation> samplingRecordOperations;

    @ApiModelProperty(value = "实验调度信息")
    private TExperimentDispatch experimentDispatch;

    @ApiModelProperty(value = "已发送数量")
    private Long sendCount;

    @ApiModelProperty(value = "待接收数量")
    private Long receiveCount;

    @ApiModelProperty(value = "已接收数量")
    private Long receivedCount;

}