机具管理添加循环截至时间

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -880,7 +880,9 @@ namespace MySystem.Areas.Admin.Controllers
                     }));
                 }
             }
-            
+            string text = string.Format("取消商户代理，创客编号: " + user.MakerCode + "，机具SN：" + pos.PosSn + "，操作人：" + SysRealName + "，Time：" + DateTime.Now + "");
+            function.WriteLog(text, "CancelMerAgent");//取消商户型代理日志
+
             return "success";
         }
 
@@ -2065,7 +2067,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 UserForMakerCode userfor = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == PosSn) ?? new UserForMakerCode();
                 bool check = db.SetMerchantTypeRecord.Any(m => m.ToUserId == userfor.UserId);
-                if(check)
+                if (check)
                 {
                     pos = db.SetMerchantTypeRecord.Where(m => m.ToUserId == userfor.UserId).OrderByDescending(m => m.Id).FirstOrDefault() ?? new SetMerchantTypeRecord();
                 }
@@ -2073,7 +2075,7 @@ namespace MySystem.Areas.Admin.Controllers
             else
             {
                 bool check = db.SetMerchantTypeRecord.Any(m => m.PosSn == PosSn);
-                if(check)
+                if (check)
                 {
                     pos = db.SetMerchantTypeRecord.Where(m => m.PosSn == PosSn).OrderByDescending(m => m.Id).FirstOrDefault() ?? new SetMerchantTypeRecord();
                 }

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -136,6 +136,7 @@ layui.config({
             ,{ field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             ,{ field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             ,{ field: 'TransferTime', width: 200, title: '划拨时间', sort: true }
+            ,{ field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             ,{ field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             ,{ field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
             ,{ field: 'SeoKeyword', width: 200, title: '押金金额', sort: true }