ERP_override.git

ERP

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

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

refs
用户	chenlu <1320612696@qq.com>
	星期四, 七月 18, 2024 10:31 +0800
提交者	chenlu <1320612696@qq.com>
	星期四, 七月 18, 2024 10:31 +0800
提交	b864a88a6d34cbed2cfaad7f5e843ea1330c9c91
目录	c3946c17c6822e8666b45dac2bc81834dbc7b1e5 目录 \| zip \| gz
parent	1b8263a5e75f48fde74dac9c2e6718c496e37a41 查看 \| 对比 7439e7de1b827e986aa03f9650ab8ca6b9ca51c7 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史