Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-15 653d67ef574c8ef1a64605f517f329eb6e6aec12

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

@@ -9,20 +9,9 @@

    private String code = "[3]";

    // 检测对象id
    private Integer sampleTypeId;

    // 检测对象排序
    private Integer sort;

    private String label;

    private String value;

    private String partNo;

    // 对象英文
    private String sampleTypeEn;

    private List<SampleDto> children;