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

gaoluyang

昨天 94b7cc1f950e68c96d6a4510629d903d4706ca27

 src/uni_modules/uni-fav/components/uni-fav/i18n/en.json

对比新文件
@@ -0,0 +1,4 @@
{
   "uni-fav.collect": "collect",
   "uni-fav.collected": "collected"
}