Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-antdvue

# Conflicts:
#	src/App.vue

src/views/system/user/index.vue

@@ -139,7 +139,7 @@
     DownloadOutlined,
     UploadOutlined,
     PrinterOutlined,
-    CommentOutlined
+    CommentOutlined,
   } from '@ant-design/icons-vue';
   import { useForm } from '@/components/Form/index';
   import {

src/views/system/user/sendMsg.vue

@@ -1,10 +1,5 @@
 <template>
-  <a-modal
-    v-model:visible="props.visible"
-    title="发送消息"
-    width="800px"
-    @cancel="dialogClose"
-  >
+  <a-modal v-model:visible="props.visible" title="发送消息" width="800px" @cancel="dialogClose">
     <a-form :model="formData" :label-col="{ style: { width: '10-0px' } }" ref="formRef">
       <a-form-item
         label="消息内容"