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

zss

2026-01-16 b434660de4d072909c41c504aed6fd944ba53c86

 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -144,6 +144,8 @@
     * 报工id
     */
    private Long productMainId;

    private Long productModelId;
    //不合格现象
    private String defectivePhenomena;