ERP_override.git

ERP

廖井涛

2025-04-25 80c1216475b7913bfa3dc0ef774ede618620cf8b

refs
用户	廖井涛 <2265517004@qq.com>
	星期五, 四月 25, 2025 14:50 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期五, 四月 25, 2025 14:50 +0800
提交	80c1216475b7913bfa3dc0ef774ede618620cf8b
目录	0356e09c200d74e9e9edbe13ed00e61b55718f4b 目录 \| zip \| gz
parent	742dd23b6bb509442d629eb79f031274b149650c 查看 \| 对比 6982cc225fad36090b8a348cd282463381c9d1dc 查看 \| 对比

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

7个文件已修改

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史