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

gongchunyi

2026-01-15 293dad30b91c26329aa165c6329220220e5bf8a1

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

@@ -13,8 +13,6 @@
    @ApiModelProperty("检验项目")
    private List<InsProduct> insProduct;

//    private List<BushingDto> bushing;

    @ApiModelProperty("子样品配置")
    private List<SampleProductDto> childSampleList;

@@ -23,8 +21,6 @@

    @ApiModelProperty("辅助线芯配置")
    private InsulatingDto auxiliaryWireCore;

//    private SheathDto sheath;

    @ApiModelProperty("检验人")
    private String checkName;