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

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

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

@@ -111,13 +111,13 @@

    private Integer parentId;

    @ApiModelProperty("数量")
    private Integer quantity;

    @ApiModelProperty("特殊标准方法")
    private String specialStandardMethod;

    @TableField(select = false,exist = false)
    private Integer num=1;

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

}