~admin/ERP_override.git

guoyuji

2024-05-22 40d76001fc009ab87c827477e225ef5fa012fdd1

refs
用户	guoyuji <guoyujie@ng.com>
	星期三, 五月 22, 2024 10:25 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期三, 五月 22, 2024 10:25 +0800
提交	40d76001fc009ab87c827477e225ef5fa012fdd1
目录	862385cca0cdc0de52408e88d8c3ab86a917beed 目录 \| zip \| gz
parent	a52b9e91b2898f533d0bf806c8165066d9670d37 查看 \| 对比 18fb477ea840e3dd4b19ff63f68f994d31fab43b 查看 \| 对比

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

8个文件已修改

	north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue	69 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史