Merge branch 'feature-dgy-新增服务费调整功能' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5638,7 +5638,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "0") Deposit = "0";
                         if (Deposit == "99") Deposit = "99";
                         if (Deposit == "199") Deposit = "199";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5652,7 +5652,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "471";
                         if (Deposit == "199") Deposit = "472";
                         if (Deposit == "299") Deposit = "473";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5665,7 +5665,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "100";
                         if (Deposit == "199") Deposit = "200";
                         if (Deposit == "299") Deposit = "300";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5678,7 +5678,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "0") Deposit = "0";
                         if (Deposit == "99") Deposit = "99";
                         if (Deposit == "199") Deposit = "199";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5692,7 +5692,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "99";
                         if (Deposit == "199") Deposit = "199";
                         if (Deposit == "249") Deposit = "249";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5705,7 +5705,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "100";
                         if (Deposit == "199") Deposit = "200";
                         if (Deposit == "299") Deposit = "300";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5719,7 +5719,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "99";
                         if (Deposit == "199") Deposit = "199";
                         if (Deposit == "299") Deposit = "299";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {
@@ -5733,7 +5733,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (Deposit == "99") Deposit = "99";
                         if (Deposit == "199") Deposit = "199";
                         if (Deposit == "299") Deposit = "299";
-                        else return "失败，无" + Deposit + "相关服务费设置权限";
+                        else return "失败，无" + Deposit + "服务费相关设置权限";
                         var info = PublicChangePosFee.SetJKDeposit(SnId.ToString(), Deposit);
                         if (info != "设置成功")
                         {

Areas/Admin/Views/MainServer/SysTools/ChangePosFee.cshtml

@@ -48,7 +48,7 @@
                                     <label class="layui-form-label">服务费</label>
                                     <div class="layui-input-inline">
                                         <select id="Deposit" name="Deposit" lay-search="">
-                                            <option value="1">0服务费</option>
+                                            <option value="0">0服务费</option>
                                             <option value="99">99服务费</option>
                                             <option value="199">199服务费</option>
                                             <option value="249">249服务费</option>