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

k94314517

2023-11-03 93c42cfcfe12125c463563f191d6ade421ba9db5

 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'