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

maven

4 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

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

@@ -36,6 +36,11 @@
    private Long salesLedgerId;

    /**
     * 预警数量
     */
    private BigDecimal warnNum;

    /**
     * 产品大类
     */
    @Excel(name = "产品大类")