Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Index.cshtml

@@ -31,7 +31,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">卡片编号</div>
-                                    <input id="CardNumber" type="text" class="form-control" />
+                                    <input id="FACode" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">资产名称</div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs

@@ -63,10 +63,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("StorageId", queryParam["StorageId"].ToString(), DbType.String);
                     strSql.Append(" AND t.StorageId = @StorageId ");
                 }
-                if (!queryParam["CardNumber"].IsEmpty())
+                if (!queryParam["FACode"].IsEmpty())
                 {
-                    dp.Add("CardNumber", "%" + queryParam["CardNumber"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.CardNumber Like @CardNumber ");
+                    dp.Add("FACode", "%" + queryParam["FACode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.FACode Like @FACode ");
                 }
                 if (!queryParam["FAName"].IsEmpty())
                 {