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

gongchunyi

2026-01-15 293dad30b91c26329aa165c6329220220e5bf8a1

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