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

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

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

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

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