fix: 解决冲突

packages/card/CHANGELOG.md

-# Change Log
-
-All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [1.0.0-beta.13](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.12...@wisdom-components/pro-card@1.0.0-beta.13) (2021-01-22)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# [1.0.0-beta.12](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.11...@wisdom-components/pro-card@1.0.0-beta.12) (2021-01-22)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# [1.0.0-beta.11](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.5...@wisdom-components/pro-card@1.0.0-beta.11) (2021-01-22)
-
-### Bug Fixes
-
-- a ([8cac226](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/8cac2265bad699c7b5349fbf90dd976ca1fc6c0d))
-
-### Features
-
-- add list ([26122d0](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/26122d06c571c7c763f1ee89ad77d7aaf262198c))
-
-# [1.0.0-beta.10](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.9...@wisdom-components/pro-card@1.0.0-beta.10) (2021-01-22)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# [1.0.0-beta.9](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.8...@wisdom-components/pro-card@1.0.0-beta.9) (2021-01-22)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# [1.0.0-beta.8](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.7...@wisdom-components/pro-card@1.0.0-beta.8) (2021-01-22)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# [1.0.0-beta.7](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.5...@wisdom-components/pro-card@1.0.0-beta.7) (2021-01-22)
-
-### Bug Fixes
-
-- a ([8cac226](https://g.civnet.cn:8443/test/winsdom-components/commits/8cac2265bad699c7b5349fbf90dd976ca1fc6c0d))
-
-### Features
-
-- add list ([26122d0](https://g.civnet.cn:8443/test/winsdom-components/commits/26122d06c571c7c763f1ee89ad77d7aaf262198c))
-
-# [1.0.0-beta.6](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.5...@wisdom-components/pro-card@1.0.0-beta.6) (2021-01-22)
-
-### Bug Fixes
-
-- a ([8cac226](https://g.civnet.cn:8443/test/winsdom-components/commits/8cac2265bad699c7b5349fbf90dd976ca1fc6c0d))
-
-### Features
-
-- add list ([26122d0](https://g.civnet.cn:8443/test/winsdom-components/commits/26122d06c571c7c763f1ee89ad77d7aaf262198c))
-
-# [1.0.0-beta.5](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.4...@wisdom-components/pro-card@1.0.0-beta.5) (2020-10-26)
-
-### Bug Fixes
-
-- update release ([aed4379](https://g.civnet.cn:8443/test/winsdom-components/commits/aed437931a3e4ecc2a5f21e86b804042056ba614))
-
-# [1.0.0-beta.4](https://g.civnet.cn:8443/test/winsdom-components/compare/@wisdom-components/pro-card@1.0.0-beta.3...@wisdom-components/pro-card@1.0.0-beta.4) (2020-10-26)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# 1.0.0-beta.3 (2020-10-25)
-
-**Note:** Version bump only for package @wisdom-components/pro-card
-
-# 1.0.0-beta.2 (2020-10-21)
-
-**Note:** Version bump only for package @ant-design/pro-card

packages/card/README.md

-# @winsdom-components/pro-card

packages/card/package.json

-{
-  "name": "@wisdom-components/pro-card",
-  "version": "1.0.0-beta.13",
-  "description": "@wisdom-components/pro-card",
-  "module": "es/index.js",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "src",
-    "dist",
-    "es"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://g.civnet.cn:8443/ReactWeb5/wisdom-components.git"
-  },
-  "browserslist": [
-    "last 2 versions",
-    "Firefox ESR",
-    "> 1%",
-    "ie >= 11"
-  ],
-  "keywords": [
-    "antd",
-    "admin",
-    "ant-design",
-    "ant-design-pro"
-  ],
-  "authors": [
-    "dengxiaofeng"
-  ],
-  "license": "MIT",
-  "bugs": "http://github.com/umijs/plugins/issues",
-  "homepage": "https://g.civnet.cn:8443/ReactWeb5/wisdom-components/tree/master/packages/card#readme",
-  "publishConfig": {
-    "access": "public"
-  }
-}

packages/card/src/card.md

----
-title: ProCard - 标准卡片
-nav:
-  title: 组件
-  path: /components
-group:
-  path: /
----
-
-# ProCard 标准卡片
-
-页内容器卡片，提供标准卡片样式，卡片切分以及栅格布局能力。
-
-## 何时使用
-
-- 需要一个标准卡片容纳内容时。
-- 需要多个卡片栅格，gutter 布局时。
-- 需要进行卡片内切分布局时。
-- 需要卡片可折叠时。

packages/card/src/index.js

-export function noop() {
-  return function () {
-    return {
-      a: 1,
-    };
-  };
-}

packages/card/src/package.json

-{
-    "name": "@wisdom-components/pro-card",
-    "version": "1.0.0-beta.12",
-    "description": "@wisdom-components/pro-card",
-    "keywords": [
-      "antd",
-      "admin",
-      "antd-design",
-      "wisdom-components"
-    ],
-    "sideEffects": [
-      "*.less"
-    ],
-    "homepage": "https://g.civnet.cn:8443/test/winsdom-components/tree/master/packages/card#readme",
-    "repository": {
-      "type": "git",
-      "url": "https://g.civnet.cn:8443/test/winsdom-components"
-    },
-    "license": "MIT",
-    "main": "lib/index.js",
-    "module": "es/index.js",
-    "types": "lib/index.d.ts",
-    "files": [
-      "lib",
-      "es",
-      "dist"
-    ],
-    "browserslist": [
-      "last 2 versions",
-      "Firefox ESR",
-      "> 1%",
-      "ie >= 11"
-    ],
-    "dependencies": {
-      "@ant-design/icons": "^4.2.1",
-      "@ant-design/pro-utils": "1.0.3",
-      "classnames": "^2.2.6"
-    },
-    "peerDependencies": {
-      "antd": "4.x",
-      "react": "^16.x"
-    },
-    "publishConfig": {
-      "access": "public"
-    },
-    "authors": [
-      "dengxiaofeng"
-    ]
-  }