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

maven

2 天以前 34e986e6e158450ee35319f1cac872a4bc974a74

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

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

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

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