Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-16 fa215acbed2974de77844a0749a68d27076e920b

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

@@ -538,6 +538,8 @@
        where a.ID=#{id}
    </select>



    <!-- 根据手机和密码查询 -->
    <select id="selectVipByPhonePassWord" resultMap="SysVipInfoMap">
        <include refid="select"></include>