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

liyong

6 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

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

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

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

    /**
     * 供应商id
     */
    private Long supplierId;
@@ -69,6 +74,7 @@
    private Long registrantId;

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

    /**