Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94

 cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js

@@ -13,7 +13,7 @@
      this.pictureId = pictureId;
      this.uploadBtnId = pictureId + "BtnId";
      this.uploadPreId = pictureId + "PreId";
      this.uploadUrl = Feng.ctxPath + '/upload/image';
      this.uploadUrl = Feng.ctxPath + '/mgr/uploadImg';
      this.fileSizeLimit = 100 * 1024 * 1024;
      this.picWidth = 800;
      this.picHeight = 800;