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

zss

4 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

@@ -138,6 +138,7 @@
     */
    private Integer inspectState;

    //采购台账产品id
    private Long purchaseLedgerId;

    /**