Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-17 ec759e2c4e9340a1f447dec93ce4742c1c8c132a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -43,7 +43,9 @@
     * @param goodsId
     * @return
     */
    Integer getGoodsSaleNum(@Param("goodsId") Integer goodsId, @Param("type") Integer type);
    Integer getGoodsSaleNum(@Param("goodsId") Integer goodsId,
                            @Param("type") Integer type,
                            @Param("userId") Long userId);


    /**