Merge remote-tracking branch 'origin/master'

This commit is contained in:
luolm 2024-09-23 21:47:05 +08:00
commit 271015fcc2
1 changed files with 1 additions and 1 deletions

View File

@ -206,7 +206,7 @@ public class MaterialService {
if(StrUtil.isNotBlank(md.getProjectType())){ if(StrUtil.isNotBlank(md.getProjectType())){
ma.setProjectType(md.getProjectType()); ma.setProjectType(md.getProjectType());
} }
ma.setMaterialGetType(md.getMaterialGetType()); ma.setMaterialGetType(1);
this.get201101MaterialDescEn(ma); this.get201101MaterialDescEn(ma);
resultList.add(ma); resultList.add(ma);