ERP_override.git

ERP

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

廖井涛

2024-08-12 b425ceaf0691b548f0e837e002a23fc2968548ad

refs
用户	廖井涛 <2265517004@qq.com>
	星期一, 八月 12, 2024 16:52 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期一, 八月 12, 2024 16:52 +0800
提交	b425ceaf0691b548f0e837e002a23fc2968548ad
目录	bc42c202fe3a214de517ea53b8e1b7800ce85ab4 目录 \| zip \| gz
parent	5b4ca677d4064eba9a4adb35f957503b82ba2899 查看 \| 对比 67f3d617209a1bb4187de453f328550cefa890a4 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/system/user/UserList.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/mapper/pp/ReportingWorkMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史