Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -104,7 +104,7 @@ namespace MySystem.Areas.Admin.Controllers
             //发货状态
             if (!string.IsNullOrEmpty(SendStatusSelect))
             {
-                condition += " and SendStatus=" + SendStatusSelect;
+                condition += " and Status=" + SendStatusSelect;
             }
             //仓库类型
             if (!string.IsNullOrEmpty(StoreTypeSelect))

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2079,7 +2079,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
-                        SeoDescription = "系统添加-过期机具回仓重置费率",
+                        SeoDescription = "系统添加-坏机换新回仓重置费率",
                         Sort = oldpos.BrandId, //品牌Id
                         PosId = oldpos.Id, //机具Id
                         PosSn = oldpos.PosSn,
@@ -2361,7 +2361,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
-                        SeoDescription = "系统添加-过期机具回仓重置费率",
+                        SeoDescription = "系统添加-坏机换新回仓重置费率",
                         Sort = oldpos.BrandId, //品牌Id
                         PosId = oldpos.Id, //机具Id
                         PosSn = oldpos.PosSn,
@@ -2735,7 +2735,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                 {
                     CreateDate = DateTime.Now, //创建时间
-                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                    SeoDescription = "系统添加-跨品牌换机重置费率",
                     Sort = oldpos.BrandId, //品牌Id
                     PosId = oldpos.Id, //机具Id
                     PosSn = oldpos.PosSn,
@@ -4871,7 +4871,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                 {
                     CreateDate = DateTime.Now, //创建时间
-                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                    SeoDescription = "系统添加-坏机回仓重置费率",
                     Sort = oldpos.BrandId, //品牌Id
                     PosId = oldpos.Id, //机具Id
                     PosSn = oldpos.PosSn,