Merge remote-tracking branch 'origin/master' into master

src/styles/element-ui.scss

@@ -578,6 +578,9 @@ label {
   background-color: #D20A10;
   border-color: #D20A10;
 }
+.el-checkbox__input.is-checked+.el-checkbox__label{
+  color: #D20A10;
+}
 .is-leaf .cell .el-checkbox {
   margin-top: 10px;
 }

src/views/system/dict/index.vue

@@ -189,13 +189,13 @@
           </template>
           <template slot-scope="scope">
             <el-link
-              v-hasPermi="['sys:dict:edit']"
+              v-hasPermi="['sys:dict:update']"
               size="mini"
               type="success"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
             <el-link
-              v-hasPermi="['sys:dict:remove']"
+              v-hasPermi="['sys:dict:delete']"
               size="mini"
               type="danger"
               style="margin-left: 10px"