Merge branch 'api' into score_shop

Helius

2021-03-01 52958bc0ffa53a616828bd6aeb9e59cf12cafbd3

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

@@ -90,7 +90,7 @@
    <!-- 更新订单时间 -->
    <update id="updateOrderTime">
      UPDATE sys_order
      set  ORDER_TIME = #{orderTime}
      set  pay_time = #{payTime}
      WHERE id=#{id}
    </update>