~admin/ERP_override.git

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

廖井涛

2024-04-25 ed6f35069824d71ee6da599a328d865eb0c58550

refs
用户	廖井涛 <2265517004@qq.com>
	星期四, 四月 25, 2024 09:16 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期四, 四月 25, 2024 09:16 +0800
提交	ed6f35069824d71ee6da599a328d865eb0c58550
目录	356f59bf5f0cb2c8188fd59d12d040876383fd41 目录 \| zip \| gz
parent	3f329319d2145dfe8a943ab4379c1bbe6a354166 查看 \| 对比 205657134d435d84114c4bb7663c17d76575cbaa 查看 \| 对比

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

18个文件已修改

1 文件已重命名

	north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue	66 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/product/BasicTable.vue	对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/Test.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/sd/BasicOtherMoneyController.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml	59 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/ReportingWork.xml	59 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/sd/OrderOtherMoneyMapper.xml	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original	对比 \| 查看 \| 原始文档 \| blame \| 历史