Merge branch 'jtwy' into dev_New

zss

昨天 1493f69da9d12415085c9be7937d4f394c5fb154

 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());