Merge branch '03/12permission' into test

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -156,7 +156,7 @@
                         @mousewheel.native.prevent
                         v-model.trim="scope.row.offlineClassesSalary"
                         placeholder="请输入内容">
-                <template slot="append"> 元/人</template>
+                <template slot="append"> 节/元</template>
                 <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
               </el-input>
               </div>