Authored by huzhiming

feat(*):合并远端代码,处理相关冲突 reviewed by tao.huang

1 { 1 {
2 "name": "xianyu-ufo-app-web", 2 "name": "xianyu-ufo-app-web",
3 - "version": "1.2.0-beta6", 3 + "version": "1.2.0-beta7",
4 "private": true, 4 "private": true,
5 "description": "Xianyu Project With Express", 5 "description": "Xianyu Project With Express",
6 "repository": { 6 "repository": {