Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-09-09 e8fd9aa8a76c638991e60544ccab53e2e5bd5b6a

 CoreCms.Net.Web.Admin/Controllers/OfflineDistributor/OfflineDistributorController.cs

@@ -150,6 +150,12 @@
            {
                where = where.And(p => p.School.Contains(School));
            }
           // 地推人员
         var pUserID = Request.Form["pUserID"].FirstOrDefault().ToInt32OrDefault(0);
            if (pUserID>0)
            {
                where = where.And(p => p.PUserID==pUserID);
            }
         //经销商名称 varchar
         var DealerName = Request.Form["DealerName"].FirstOrDefault();
            if (!string.IsNullOrEmpty(DealerName))
@@ -650,7 +656,7 @@
                        cellNumTemp++;

                    var rowTemp12 = rowTemp.CreateCell(cellNumTemp);
                        rowTemp12.SetCellValue(listModel[i].NegotiationRecord.ToString());
                        rowTemp12.SetCellValue(listModel[i].NegotiationRecord?.ToString());
                        rowTemp12.CellStyle = commonCellStyle;
                        cellNumTemp++;