Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/PCS-FrontEnd into dev

src/views/role/index.vue

@@ -348,7 +348,7 @@ export default {
         function: []
       },
       rules: {
-        name: [{required: true, message: '请输入部门名称', trigger: 'blur'},],
+        name: [{required: true, message: '请输入角色名称', trigger: 'blur'},],
         tenant: [{required: true, message: "请选择", trigger: "change"}],
       },
     }