Merge branch 'dev_lzh_wms_20260120' into wms_dev

This commit is contained in:
zhou-hongcheng
2026-01-24 17:20:53 +08:00
@@ -54,7 +54,7 @@ public class MaterialBaseInfoApi extends BaseController {
{
//转换实体
MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
if(1 == materialBaseInfoDTO.getUpdateFeign()){
if(materialBaseInfoDTO.getMaterialBaseInfoId() != null){
return toAjax(materialBaseInfoApplicationService.update(materialBaseInfoDO));
}else {
return toAjax(materialBaseInfoApplicationService.insert(materialBaseInfoDO));