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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java

@@ -26,6 +26,10 @@
     * 备件价格
     */
    private BigDecimal price;
    /**
     * 数量
     */
    private BigDecimal quantity;

    /**
     * 设备id集合（字符串,隔开）