~admin/ERP_override.git

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-05-13 953cf9bded915815a27a9a8a844b0b70266e08b1

refs
用户	廖井涛 <2265517004@qq.com>
	星期一, 五月 13, 2024 09:46 +0800
提交者	廖井涛 <2265517004@qq.com>
	星期一, 五月 13, 2024 09:46 +0800
提交	953cf9bded915815a27a9a8a844b0b70266e08b1
目录	14495ff8b163e3f0b2780413ec8b678249fc3c50 目录 \| zip \| gz
parent	27601fb04f179f3173d9b0ca0b91b50cab97db18 查看 \| 对比 5efb25463fb6a6825ab8c85b880815af32d37515 查看 \| 对比

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

28个文件已修改

	north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/userInfo.js	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue	393 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue	400 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue	308 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue	388 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue	249 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue	351 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue	338 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue	376 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java	68 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionBasicMapper.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	179 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	306 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史