ERP_override.git

ERP

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

guoyuji

2024-09-18 b1d4056d5fd73ecd76a13196f2d2305edb00a262

refs
用户	guoyuji <guoyujie@ng.com>
	星期三, 九月 18, 2024 15:45 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期三, 九月 18, 2024 15:45 +0800
提交	b1d4056d5fd73ecd76a13196f2d2305edb00a262
目录	5626bfdcc8d2330ebd284fad2dd5a88588d7e217 目录 \| zip \| gz
parent	b21cbd952f30befa9bf976df8f29e4a27287ad5f 查看 \| 对比 62bf5087d858ec97b2262c77311cd916dfd35001 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue	96 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史