Merge branch 'master' into pim_meet

buhuazhen

8 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -104,14 +104,22 @@

    @TableField(exist = false)
    @ApiModelProperty(value = "未开票金额(元)")
    private BigDecimal noInvoiceAmountTotal;
    private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;

    @ApiModelProperty(value = "签订日期")
    private LocalDate executionDate;

    @TableField(exist = false)
    @ApiModelProperty(value = "已开票金额(元)")
    private BigDecimal invoiceTotal;
    private BigDecimal invoiceTotal = BigDecimal.ZERO;

    @TableField(exist = false)
    @ApiModelProperty(value = "回款金额")
    private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;

    @TableField(exist = false)
    @ApiModelProperty(value = "待回款金额")
    private BigDecimal noReceiptAmount = BigDecimal.ZERO;

    @ApiModelProperty(value = "付款方式")
    private String paymentMethod;