mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-10-31 18:28:44 +08:00 
			
		
		
		
	Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
Conflicts: package.json
This commit is contained in:
		| @@ -11,7 +11,7 @@ | |||||||
|         <el-input v-model="formData.title" placeholder="请输入公告标题" /> |         <el-input v-model="formData.title" placeholder="请输入公告标题" /> | ||||||
|       </el-form-item> |       </el-form-item> | ||||||
|       <el-form-item label="公告内容" prop="content"> |       <el-form-item label="公告内容" prop="content"> | ||||||
|         <Editor :model-value="formData.content" height="150px" /> |         <Editor v-model="formData.content" height="150px" /> | ||||||
|       </el-form-item> |       </el-form-item> | ||||||
|       <el-form-item label="公告类型" prop="type"> |       <el-form-item label="公告类型" prop="type"> | ||||||
|         <el-select v-model="formData.type" clearable placeholder="请选择公告类型"> |         <el-select v-model="formData.type" clearable placeholder="请选择公告类型"> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV