From e8b408de769daf40d15f62c4e764d528ceb4f2f8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 四月 2024 14:17:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 8d12ab0..3d48fab 100644
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,9 +1,11 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\PatchLog.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\BasicDateProduceService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MybatisPlusConfig.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\DeviceMaintenanceController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductDetailMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\GlassType.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OptimizeUse.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\interceptor\JwtInterceptor.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\WorkOrderMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\WorkprogressMonthlySettlement.java
@@ -79,6 +81,7 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyWebSocketHandler.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\FlowCard.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkDetailMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\DeviceMaintenanceService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysError.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\ServiceException.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyChannelHandlerPool.java
@@ -132,6 +135,7 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\CustomerController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DeviceMaintenanceMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\GlobalExceptionHandle.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\DeliveryService.java

--
Gitblit v1.8.0