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

gongchunyi

7 天以前 70538f5464af062cd52628d468a17a8bb885e88f

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

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

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

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