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

zss

2 天以前 b434660de4d072909c41c504aed6fd944ba53c86

 src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java

@@ -35,6 +35,11 @@
    private Long purchaseLedgerId;

    /**
     * 产品id
     */
    private Long saleLedgerProjectId;

    /**
     * 产品大类
     */
    private String productCategory;