Merge remote-tracking branch 'origin/master'

2024-09-23 21:47:05 +08:00 · 2024-09-23 21:47:05 +08:00 · 271015fcc2
parent 2607d23cb8 60ae7f1a9c
commit 271015fcc2
1 changed files with 1 additions and 1 deletions
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
@ -206,7 +206,7 @@ public class MaterialService {
            if(StrUtil.isNotBlank(md.getProjectType())){
                ma.setProjectType(md.getProjectType());
            }
-            ma.setMaterialGetType(md.getMaterialGetType());
+            ma.setMaterialGetType(1);
            this.get201101MaterialDescEn(ma);
            resultList.add(ma);