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

liyong

16 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

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

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

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