Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e

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

@@ -125,8 +125,11 @@
         <if test="record.shopId != null and record.shopId != ''">
            and a.shop_id=#{record.shopId}
         </if>

      </where>
      <if test="record.sort !=null">
         order by
         a.${record.sort} ${record.order}
      </if>
      <if test="record.offset >=0  and record.limit >0">
         limit
         #{record.offset},#{record.limit}