Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-22 f6d898060ce3ab0bbca1924fad724858d4adc296

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

@@ -1345,6 +1345,9 @@
        <if test="record.sort != 'monthArrived' and record.sort != 'yearArrived'">
            order by ${record.sort} ${record.order}
        </if>
        <if test="record.offset >=0  and record.limit >0">
            limit #{record.offset},#{record.limit}
        </if>
    </select>

    <select id="selectVipInfoById" resultType="com.matrix.system.app.vo.VipInfoVo">