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

liyong

4 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

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

@@ -39,7 +39,7 @@
    /**
     * 采购订单产品id
     */
    private Long saleLedgerProductId;
    private Long salesLedgerProductId;

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

    // 租户id