ERP_override.git

ERP

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

廖井涛

2024-07-30 272d3ffe20fd06e340ce3994e6598b98399edf51

refs
用户	廖井涛 <2265517004@qq.com>
	星期二, 七月 30, 2024 11:36 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期二, 七月 30, 2024 11:36 +0800
提交	272d3ffe20fd06e340ce3994e6598b98399edf51
目录	e5d7b3283e045705e2921246df58e3ecd9f5f15a 目录 \| zip \| gz
parent	11c4bf931144a4d82093ba9814f36111217d0989 查看 \| 对比 285eb3d959fab0c245e3cf304e1bb7adc53324d0 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue	116 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabel.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkDetailMapper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWorkDetail.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史