Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java

@@ -106,8 +106,16 @@
        {
            communityId=getCommunityId()+"";
        }

        String userId=null;

        if(StringUtils.isEmpty(merchantId))
        {
            userId=getUserId()+"";
        }

        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType,merchantId);
                condition,userName,communityId,userId,orderType,merchantId);
    }

    /**