ERP_override.git

ERP

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

廖井涛

2025-05-09 c3fe22add66737e4ccd57299aa9eff02e47343b7

refs
用户	廖井涛 <2265517004@qq.com>
	星期五, 五月 9, 2025 13:38 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期五, 五月 9, 2025 13:38 +0800
提交	c3fe22add66737e4ccd57299aa9eff02e47343b7
目录	9f8d8a3473eb2f71921a3bb04d81dd532d9f60ea 目录 \| zip \| gz
parent	aa979ce4fbac1caaf32f568a08631820d3747d30 查看 \| 对比 b16b8690303b3f949e5f0c2c39375b800e82d05f 查看 \| 对比

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

13个文件已修改

	north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/system/app/appDownload.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史