Merge branch 'feature-dgy-查询商户达标明细调整' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5239,7 +5239,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
-                    if (mer.MerIdcardNo.Contains("*") || mer.MerchantMobile.Contains("*") || mer.MerRealName.Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
+                    if ( function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }