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

935090232@qq.com

2021-01-17 31b85d0135090435438545ece57142d62f185224

 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java

@@ -84,5 +84,6 @@
   public Double  selectVipCardTotalMoney(@Param("vipId") Long vipId);


   List<MoneyCardUse> selectHasValidMoneyCardUse();
    
}