Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -449,7 +449,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int id = int.Parse(subid);
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == id && m.Status == 4) ?? new MerchantDepositReturns();
-                Ids += Id + ",";
+                if (merchantDepositReturns.Id > 0)
+                {
+                    Ids += subid + ",";
+                }
             }
             DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");
             string text = string.Format("商户押金退还，记录Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");