ERP_override.git

ERP

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

廖井涛

2024-07-16 9d8f1ecf0dcdf7de5fe9db39a125540640d83a25

refs
用户	廖井涛 <2265517004@qq.com>
	星期二, 七月 16, 2024 15:35 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期二, 七月 16, 2024 15:35 +0800
提交	9d8f1ecf0dcdf7de5fe9db39a125540640d83a25
目录	23a338a76c5c86f3a784f7e57c67955615edfe4e 目录 \| zip \| gz
parent	681443cf4f1791a57b6bc63ed6611021d748cede 查看 \| 对比 d0f2e92928310f574e9d6aa572211efd01e60322 查看 \| 对比

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

12个文件已修改

	north-glass-erp/northglass-erp/src/layout/MainErpView.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue	88 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ProductionSchedulingMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史