Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java

@@ -120,4 +120,10 @@
    @TableField(select = false,exist = false)
    private Integer num=1;

    /**
     * 是否为熔接损耗特殊项生成的样品组合(0:否 1:是)
     */
    @ApiModelProperty("是否为熔接损耗特殊项生成的样品组合(0:否 1:是)")
    private String isPairing;

}