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

zouyu

4 天以前 c43ec56912aa1a5a711dc31c059324e43061964c

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

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

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

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