|
|
@@ -206,7 +206,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
condition += " and KqSnNo='" + PosSn + "'";
|
|
|
}
|
|
|
- Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
|
|
|
+ Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "KqRegTime DESC", "0", page, limit, condition);
|
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
|
{
|
|
|
@@ -362,7 +362,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
condition += " and KqSnNo='" + PosSn + "'";
|
|
|
}
|
|
|
|
|
|
- Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", 1, 20000, condition, "MerchantName,Remark,KqMerNo,KqSnNo,UserId", false);
|
|
|
+ Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", 1, 20000, condition, "MerchantName,Remark,KqMerNo,KqSnNo,UserId,KqRegTime", false);
|
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
|
{
|
|
|
@@ -404,7 +404,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
ReturnFields.Add("MerchantName", "商户名称");
|
|
|
ReturnFields.Add("BrandName", "机具品牌");
|
|
|
ReturnFields.Add("KqSnNo", "机具SN");
|
|
|
- ReturnFields.Add("GetTime", "领取时间");
|
|
|
+ ReturnFields.Add("KqRegTime", "退还时间");
|
|
|
ReturnFields.Add("SeoKeyword", "服务费金额");
|
|
|
ReturnFields.Add("Remark", "已退还金额");
|
|
|
ReturnFields.Add("MakerCode", "创客编号");
|