Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-29 02fecd88de1beaf80de66e07a0568da471dfd751

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -475,6 +475,7 @@
            MAX(pay_time) payTime,
            GROUP_CONCAT(DISTINCT t2.shop_short_name) shopName
        from sys_order t1
        left join sys_order_item b on t1.id=b.ORDER_ID and goods_id!=5583
        left join sys_shop_info t2 on t1.SHOP_ID=t2.ID
        where VIP_ID=#{vipId} and STATU='已付款';
    </select>