Merge branches 'dev' and 'dev' of git.singsingenglish.com:new-sing/admin into dev

src/components/system/staff.vue

@@ -326,6 +326,7 @@
 
       onSearch(){
         this.getData();
+        this.$route.params.model = ''
       },
 
       onPageChange(val) {

src/components/teacherDetail/customer.vue

@@ -113,7 +113,7 @@
             <td>{{ item.friend_nickname }}</td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.allow_time }}</td>
-            <td>{{ item.add_time_long }}</td>
+            <td>{{ item.add_time_long }}min</td>
           </template>
         </tr>
         </tbody>