Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 ce0651907f18a57dae80065e01589e975530f53e

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetTerm.java

@@ -57,26 +57,6 @@
    @TableField("sample_require")
    private String sampleRequire;

    @ApiModelProperty(value = "检测标准")
    @TableField("term_standard")
    private String termStandard;

    @ApiModelProperty(value = "检测仪器")
    @TableField("term_instrument")
    private String termInstrument;

    @ApiModelProperty(value = "检测试剂")
    @TableField("term_reagent")
    private String termReagent;

    @ApiModelProperty(value = "检测步骤")
    @TableField("term_step")
    private String termStep;

    @ApiModelProperty(value = "检测结果")
    @TableField("term_result")
    private String termResult;

    @ApiModelProperty(value = "状态 -1=草稿箱 1=未填写 2=已填写")
    @TableField("status")
    private Integer status;