ERP_override.git

ERP

chenlu

2024-04-23 9752367ec1f8b3ed8debec00654b072f38d1452c

refs
用户	chenlu <1320612696@qq.com>
	星期二, 四月 23, 2024 18:05 +0800
提交者	chenlu <1320612696@qq.com>
	星期二, 四月 23, 2024 18:05 +0800
提交	9752367ec1f8b3ed8debec00654b072f38d1452c
目录	43c127616405e1845598f1c3045467d1bcf7e3ae 目录 \| zip \| gz
parent	ee3497572b5982d21c61a871728789dd9f7033e5 查看 \| 对比 c6c069979706b557cf16fe7307c40e34334b18c8 查看 \| 对比

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

# Conflicts:
#	north-glass-erp/northglass-erp/config.js

5个文件已修改

	north-glass-erp/northglass-erp/config.js	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史