Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 26b0738803e630a3f1e9878a6999f784c8cf07c7

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopPointMapper.xml

@@ -48,7 +48,7 @@
        tsp.type,
        tsp.create_time,
        tsp.variable_point,
        tsp.order_num
        tsp.order_num as orderNum
        FROM
        t_shop_point tsp
        LEFT JOIN t_shop ts ON tsp.shop_id = ts.id