ERP_override.git

ERP

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

guoyuji

2024-07-04 7a58e13756e87d5ddaeeeb936446287b587d4492

refs
用户	guoyuji <guoyujie@ng.com>
	星期四, 七月 4, 2024 17:20 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期四, 七月 4, 2024 17:20 +0800
提交	7a58e13756e87d5ddaeeeb936446287b587d4492
目录	e4890b7ba0993d2ada83d8bdf1b4a1da64341a2c 目录 \| zip \| gz
parent	4ac24ca67f44a85d7aa7be5811baad690f0a92e8 查看 \| 对比 a6b1fcb78a6d2fef7e04af916c20cbc63b8dc3e3 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/lang/en.js	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/lang/zh.js	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	44 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	116 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史