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

src/views/system/notify/template/NotifyTemplateForm.vue

@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item label="角色" prop="roleIds">
         <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"
           /></el-select> 
       </el-form-item>
       <el-form-item label="模板内容" prop="content">