ERP_override.git

ERP

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

guoyujie

2025-07-08 368b5a8bed1af57fb51f5c836e2e15059765019b

refs
用户	guoyujie <guoyujie@ng.com>
	星期二, 七月 8, 2025 09:03 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期二, 七月 8, 2025 09:04 +0800
提交	368b5a8bed1af57fb51f5c836e2e15059765019b
目录	2dd2a7d77056b9a8ecd8f340fcd86dd5208d8e4b 目录 \| zip \| gz
parent	788f4f217e039a3f2b4982e9d0fc0afb36a483f5 查看 \| 对比 06fc11c7d35a166daf4dde3aae31c6ea412b6cf0 查看 \| 对比

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

# Conflicts:
#	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

4个文件已修改

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	56 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史