Merge remote-tracking branch 'origin/master'

xuhy

9 天以前 33fea8cb7804ba9ee45a1c832907cbde5f336444

 ruoyi-system/src/main/java/com/ruoyi/system/query/TSamplingRecordQuery.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "实验编号")
    private String experimentCode;

    @ApiModelProperty(value = "创建人")
    private String createBy;

    @ApiModelProperty(value = "状态 -1=草稿箱 1=已发送待提交 2=已提交 3=已封存")
    @TableField("status")
    private Integer status;