Merge remote-tracking branch 'origin/master'

吴羡

昨天 cdd9ef5944a1cda82d98f1544fb451c7dd4f8c3d

 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java

@@ -17,6 +17,9 @@
@ExcelIgnoreUnannotated
public class SampleOrderDto extends InsOrder {

    @Schema(description = "是否允许编辑")
    private Boolean editable;

    @Schema(description = "检验对象")
    private String sampleType;