~admin/ERP_override.git

chenlu

2024-05-16 b84f5fb3a41a745a2b96b35a0127ad24ebb5eb26

refs
用户	chenlu <1320612696@qq.com>
	星期四, 五月 16, 2024 10:18 +0800
提交者	chenlu <1320612696@qq.com>
	星期四, 五月 16, 2024 10:18 +0800
提交	b84f5fb3a41a745a2b96b35a0127ad24ebb5eb26
目录	2746054da706ade338364cfe416f64482c776c38 目录 \| zip \| gz
parent	39303996f7573ad1434ebeea5b74b7d2a79d0af1 查看 \| 对比 6e51e9e1089e91eae466315d54cac7c5066cf4cd 查看 \| 对比

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

8个文件已修改

2个文件已添加

	north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/Report.xml	673 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml	153 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史