Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

2025-07-25 ff1dcdad798b3fd484439e8a87a4d0ac75ab5720

 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;
}