Merge remote-tracking branch 'origin/master'

xuhy

2024-08-16 3e1fc145ecefd1d823423b2e31366a0c1c9a723c

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

@@ -45,6 +45,7 @@
            return pageInfo;
        }
        String string = stringBuilder.toString();
        // 订单号加上商品类型
        String res = string+"-"+dto.getType();

        List<Integer> data = orderClient.getSalesCountByGoodsId(res).getData();