1

DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs

@@ -1016,13 +1016,10 @@ namespace DSWeb.Areas.CommMng.DAL
                 //var cdc = new CommonDataContext();
                 //var currHead = cdc.ch_fee_payapplication.First(x => x.BILLNO == headdata.BILLNO);
 
-<<<<<<< HEAD
+
                 var currHead = ChpayapplicationDAL.GetData_All($" cm.billno={headdata.BILLNO}");
 
                 if (!string.IsNullOrWhiteSpace(currHead.PAYAPPID))
-=======
-                if (!string.IsNullOrWhiteSpace(headdata.PAYAPPID)) 
->>>>>>> 2802808cb4c2b91876b8aeec69145b2523b04efc
                 {
                     result.SetErrorInfo("业务已经提交至泛微OA");
                     泛微OAHelper.BILLDONE(headdata.BILLNO);