resolve merge conflicts: keep theirs for all binary files

dytyqx

1 天以前 ba927b1faad68ab38d053ee9ea9eeac4b1a5531b

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -2473,6 +2473,7 @@
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                }
                else if (refSav == "Update")
                {
@@ -2525,7 +2526,7 @@
                tableList.Add(ds.Tables[1]);
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.code = "0"; 
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;