Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

 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>