ERP_override.git

ERP

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

guoyuji

2024-04-23 8449b7205be9e73ddd353f9835a40fd1d72462d4

refs
用户	guoyuji <guoyujie@ng.com>
	星期二, 四月 23, 2024 14:46 +0800
提交者	guoyuji <guoyujie@ng.com>
	星期二, 四月 23, 2024 14:46 +0800
提交	8449b7205be9e73ddd353f9835a40fd1d72462d4
目录	990b3ff19aa806dea43c96668594f45c06535465 目录 \| zip \| gz
parent	63e493245086f107bacb8abcf30704afcc9fa4f6 查看 \| 对比 492f1870ad3f79064f5d1a00cef4ad985cd0f8cf 查看 \| 对比

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

3个文件已添加

17个文件已修改

	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/router/index.js	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseBasicData.vue	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue	136 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue	185 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/report/WorkInProgress.vue	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/vite.config.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/entity/mm/BasicWarehouseType.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/application.yml	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/application.yml	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/mapper/pp/FolwCard.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史