曹鹏飞 d91db60c95 Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition ... # Conflicts: # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomChildMapper.java # nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java # nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomChildMapper.xml		2024-06-15 19:51:02 +08:00
nflg_project_dev	Merge branch 'refs/heads/feature/DM/nflg-bom' into feature/DM/nflg-bom-transition	2024-06-15 19:51:02 +08:00
.gitignore	fix(ebom): 修复导入到sap的错误信息保存问题	2024-05-29 11:42:38 +08:00