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

liding

7 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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

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

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

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