Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_local

app/controllers/shixuns_controller.rb

@@ -771,7 +771,7 @@ class ShixunsController < ApplicationController
     @shixun = Shixun.new(params[:shixun])
     @shixun.user_id = User.current.id
     @shixun.trainee = params[:trainee]
-    @shixun.webssh = params[:webssh].to_i
+    #@shixun.webssh = params[:webssh].to_i
     @shixun.multi_webssh = @shixun.webssh == 2 && params[:multi_webssh] == "1" ? 1 : 0
     @shixun.vnc = params[:vnc].to_i
     @shixun.can_copy = params[:can_copy].to_i

app/views/shixuns/_form.html.erb

@@ -97,7 +97,7 @@
           <p data-shixun-value="1">初级学员</p>
           <p data-shixun-value="2">中级学员</p>
           <p data-shixun-value="3">高级学员</p>
-          <p data-shixun-value="3">顶级学员</p>
+          <p data-shixun-value="4">顶级学员</p>
         </div>
       </div>
       <span class="fl ml10 mt6 color-grey">标签，不限定用户群体</span>

app/views/shixuns/_settings_edit.html.erb

@@ -157,7 +157,7 @@
                 <p data-shixun-value="1">初级学员</p>
                 <p data-shixun-value="2">中级学员</p>
                 <p data-shixun-value="3">高级学员</p>
-                <p data-shixun-value="3">顶级学员</p>
+                <p data-shixun-value="4">顶级学员</p>
               </div>
             </div>
             <span class="fl ml10 mt6 color-grey">标签，不限定用户群体</span>