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

zss

2 天以前 f9c5f3e02cd32d201428ef0700411f7c421b25fa

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

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

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

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