Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 e5bab34f9e8545a49c39e424c37ed7981b792459

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopPointServiceImpl.java

@@ -52,7 +52,7 @@
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();

        List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>()
                .eq(Shop::getAppUserId,sysUser.getAppUserId()));
                .eq(Shop::getAppUserId,sysUser.getObjectId()));
        Integer sPoint = 0;
        Integer shopCommissionPoint = 0;
        Integer subShopCommissionPoint = 0;