Merge branch 'jtwy' into dev_New

zss

23 小时以前 1493f69da9d12415085c9be7937d4f394c5fb154

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

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

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

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