Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

 Conflicts:

	src/router/modules/remaining.ts

src/views/Profile/components/UserAvatar.vue

@@ -4,7 +4,7 @@
       ref="cropperRef"
       :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
       :showBtn="false"
-      :value="avatar"
+      :value="img"
       width="120px"
       @change="handelUpload"
     />
@@ -13,15 +13,13 @@
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { uploadAvatar } from '@/api/system/user/profile'
+import { CropperAvatar } from '@/components/Cropper'
 
 defineOptions({ name: 'UserAvatar' })
 
-const props = defineProps({
+defineProps({
   img: propTypes.string.def('')
 })
-const avatar = computed(() => {
-  return props.img
-})
 
 const cropperRef = ref()
 const handelUpload = async ({ data }) => {