Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

昨天 15335f28e9c52b0eeafb622c2aec08d22ad4e52f

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -299,7 +299,7 @@
        toc.goods_num goodsNum,
        toc.shop_id shopId,
        toc.create_time createTime,
        toc.cancel_type cancelType,
        toc.cancel_type cancelType
        FROM t_order toc
        WHERE toc.del_flag = 0
        <if test="param.userId != null">