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

maven

17 小时以前 1cf92e13371b55c4449ccb48b264eea547eccb86

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

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

    /**
     * 采购订单产品id
     */
    private Long saleLedgerProductId;

    /**
     * 供应商id
     */
    private Long supplierId;
@@ -66,9 +71,11 @@
    /**
     * 登记人
     */
    @TableField(fill = FieldFill.INSERT)
    private Long registrantId;

    // 租户id
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    /**