Merge branch 'api' into hive2.0

jyy

2021-03-08 1cd8df7e8f42fb0d9292055ff97e4e5480087112

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

@@ -535,4 +535,16 @@
        where a.ORDER_ID=#{orderId};
    </select>

    <select id="selectErpOrderItemByOrderId"
            resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo">
            select
               b.name goodsName,
               a.COUNT count,
               a.PRICE price,
               a.ZK_PRICE zkPrice
        from sys_order_item a
        inner join shopping_goods b on a.goods_id=b.id
        where a.ORDER_ID=#{orderId}
    </select>

</mapper>