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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

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

@@ -102,12 +102,12 @@
    /**
     * 未来票数
     */
    private BigDecimal futureTickets;
    private BigDecimal futureTickets = BigDecimal.ZERO;

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

    /**
     * 产品id