Merge branch 'dev'

README.md

@@ -18,4 +18,5 @@
 2.设置`.gitattributes`
 3.master 修改忽略文件,提交; 分支修改忽略文件,提交;分支合并master,提交
 
-master
+
+dev-1

app/service/shop/goodsJoinAct.js

@@ -117,7 +117,8 @@ class GoodsJoinActService extends CrudService {
         as: 'goods_prototype',
       },
     });
-    pipeline.push({ $match: { 'goods_prototype.length': { $gt: 0 } } });
+    pipeline.push({ $addFields: { gp_length: { $size: '$goods_prototype' } } });
+    pipeline.push({ $match: { gp_length: { $gt: 0 } } });
     pipeline.push({
       $project: {
         meta: 1,