Merge branch '0601Action' into test

src/views/teamBuild/initiationList.vue

@@ -140,7 +140,7 @@
             <template slot-scope="scope">
               <div>
                 {{
-                  scope.row.teacherRecommandSubjectId==-1
+                  scope.row.teacherRecommandSubjectId!=-1
                     ? scope.row.subjectName
                     : "无"
                 }}