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

maven

5 小时以前 55c4143362c7df1ece4523597e26947d35e21bda

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

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -94,7 +94,8 @@
        approveProcess.setDeviceRepairId(approveProcessVO.getDeviceRepairId());
        approveProcess.setMaintenancePrice(approveProcessVO.getMaintenancePrice());
        approveProcess.setPrice(approveProcessVO.getPrice());
        approveProcess.setApproveOverTime(null);
        approveProcess.setStartDate(approveProcessVO.getStartDate());
        approveProcess.setEndDate(approveProcessVO.getEndDate());
        approveProcess.setApproveStatus(0);
        approveProcess.setApproveDelete(0);
        approveProcess.setApproveType(approveProcessVO.getApproveType());

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

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

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