chore: auto merge branches (#56870)

chore: feature merge master

components/upload/style/picture.ts

@@ -141,6 +141,8 @@ const genPictureCardStyle: GenerateStyle<UploadToken> = (token) => {
       [`${listCls}${listCls}-picture-card, ${listCls}${listCls}-picture-circle`]: {
         display: 'flex',
         flexWrap: 'wrap',
+        height: uploadPictureCardSize,
+
         '@supports not (gap: 1px)': {
           '& > *': {
             marginBlockEnd: token.marginXS,

package.json

@@ -221,7 +221,7 @@
     "adm-zip": "^0.5.16",
     "ajv": "^8.17.1",
     "ali-oss": "^6.23.0",
-    "antd-img-crop": "^4.27.0",
+    "antd-img-crop": "~4.27.0",
     "antd-style": "^4.1.0",
     "antd-token-previewer": "^3.0.0",
     "axios": "^1.13.2",