解决合并冲突

chenhaozhe

2025-06-12 579d2b489f9565f6e506ddbef634d65aa20dc27e

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillEditController.cs

@@ -648,7 +648,7 @@
                // åˆ é™¤æ•°æ®åº“记录
                oCN.RunProc("delete from Gy_SOPBillSub2 where HItemID =" + HFileID);
           
                File.Delete(HPath);      //删除指定文件
                //File.Delete(HPath);      //删除指定文件
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";