大米 5f11a53c81 Merge branch 'DM/10月需求' into test ... # Conflicts: # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/BomConstant.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewPbomParentVO.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java # nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml		2024-09-27 08:31:20 +08:00
nflg_project_dev	Merge branch 'DM/10月需求' into test	2024-09-27 08:31:20 +08:00
.gitignore	fix(ebom): 修复导入到sap的错误信息保存问题	2024-05-29 11:42:38 +08:00