Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/school/student/stulist.vue

@@ -77,9 +77,11 @@
                     <div style="max-height:600px;overflow-y:auto;">
                       <table class="stuListTable" style="border-collapse:collapse;">
                         <tr>
+                          <th>角色</th>
                           <th>协同人</th>
                         </tr>
                         <tr v-for="(sItem,sIndex) in props.row.AssistList" style="border-bottom:1px dashed #d1d1d1;" :key="sIndex">
+                          <td>{{sItem.AssistTypeName}}</td>
                           <td>{{sItem.AssistName}}</td>
                         </tr>
                       </table>