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

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java

@@ -97,7 +97,7 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
                         r.like(UserInfo::getNickName, key);
                     });
                 })
-                .select("sum(amount)")
+                .select("sum(tb_member_order.amount)")
                 .eq(MemberOrder::getShopId, StpKit.USER.getMainShopId()), BigDecimal.class).orElse(BigDecimal.ZERO));
         return map;
     }