~admin/ERP_override.git

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

廖井涛

2024-04-23 2f894921e5cf74910805f08a5e3180b68ac09e18

refs
用户	廖井涛 <2265517004@qq.com>
	星期二, 四月 23, 2024 15:50 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期二, 四月 23, 2024 15:50 +0800
提交	2f894921e5cf74910805f08a5e3180b68ac09e18
目录	00dbee45be47dbb5ceb51a5f527f403805df5d75 目录 \| zip \| gz
parent	01c5497458a608554d7a01a789f82511cd3455b8 查看 \| 对比 3f4c58d5b830d9e00454f62c6713566b6b8f127a 查看 \| 对比

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

# Conflicts:
#	north-glass-erp/target/classes/mapper/sd/DeliveryDetailMapper.xml
#	north-glass-erp/target/classes/mapper/sd/DeliveryMapper.xml

20个文件已修改

	north-glass-erp/northglass-erp/package-lock.json	493 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/package.json	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue	301 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	44 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/vite.config.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/FolwCard.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/OrderMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史