Merge branch 'dev' into dev_cr

zhuo

2025-02-25 a0b5291eb64b13555d4390aba7782eb76dced376

 basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java

@@ -219,10 +219,4 @@
     */
    @ApiModelProperty("导体类型")
    private String conductorType;

    @ApiModelProperty("structure_test_object表id")
    private Integer structureTestObjectId;

    @ApiModelProperty("product  产品id")
    private Integer productId;
}