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

jyy

2021-01-26 c3c0a5dc4c3ccc8af4809aa3c789ffe5028377e4

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

@@ -616,4 +616,8 @@
    </select>


    <select id="selectHasValidMoneyCardUse" resultMap="MoneyCardUseSimpleMap">
        select * from money_card_use
        where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
    </select>
</mapper>