ERP_override.git

ERP

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

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

refs
用户	guoyujie <guoyujie@ng.com>
	星期一, 十一月 17, 2025 08:50 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期一, 十一月 17, 2025 08:50 +0800
提交	613e4e92157dd697629dbad17fd091ae37637bc7
目录	02efa28a9dcd0a4664fa4303c769604296cc8c29 目录 \| zip \| gz
parent	7fdc12195ab810476f01f6d332cbcd0a271effdb 查看 \| 对比 85e23c1b75e907a05924fc5f9e059ce76749e501 查看 \| 对比

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

14个文件已修改

1个文件已添加

	north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/router/index.js	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetailSmallPiece.vue	508 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	30 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史