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

gongchunyi

18 小时以前 da54b18e2934c39eb21e246aeda8baef9d1af933

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

@@ -111,22 +111,22 @@
    /**
     * 本次来票数
     */
    private BigDecimal ticketsNum;
    private BigDecimal ticketsNum=BigDecimal.ZERO;

    /**
     * 本次来票金额(元)
     */
    private BigDecimal ticketsAmount;
    private BigDecimal ticketsAmount=BigDecimal.ZERO;

    /**
     * 未来票数
     */
    private BigDecimal futureTickets;
    private BigDecimal futureTickets=BigDecimal.ZERO;

    /**
     * 未来票金额(元)
     */
    private BigDecimal futureTicketsAmount;
    private BigDecimal futureTicketsAmount=BigDecimal.ZERO;

    @ApiModelProperty(value = "开票数")
    private BigDecimal invoiceNum;