Merge branch 'dev_cr' into dev

chenrui

2025-03-11 379222715511cc4d6efd4abbbb3463f5485f590d

 basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java

@@ -13,11 +13,6 @@

    private String value;

    private String partNo;

    // 样品英文
    private String sampleEn;

    private List<ModelDto> children;

}