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

maven

3 天以前 03386a78c3a1f92efa21a6748e38c2c5d1c996d9

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

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

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

    /**
     * 产品大类
     */
    private String productCategory;
@@ -121,5 +126,5 @@
    private Date createdAt;

    @TableField(fill = FieldFill.INSERT)
    private Integer tenantId;
    private Long tenantId;
}