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

jiaosong

2023-11-03 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6

 admin/src/components/common/UploadAvatarImage.vue

@@ -30,7 +30,7 @@
  },
  data() {
    return {
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadPicture',
      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
      // uploadData: {
      //   folder: 'upload',
      //   type: 'image'