合并冲突

chenhaozhe

2025-05-30 edcd7574e709748c5d3ccc0bd54930414ddcfc9a

 WebAPI/Controllers/Xt_DefineBillMainSetController.cs

@@ -149,6 +149,10 @@
                ls = oListModels.getObjectByJson_Xt_DefineBillMainSetSub(msg3);
                foreach (Model.ClsXt_DefineBillMainSetSub oItemSub in ls)
                {
                    if ((oItemSub.HElementID == null || oItemSub.HElementID == "")&&oItemSub.HElementIDAdditionalName!="")
                    {
                        oItemSub.HElementID = oItemSub.HElementIDAdditionalName;
                    }
                    oBill.DetailColl.Add(oItemSub);
                }