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

jyy

2021-01-15 1bb16954b0630bd078483c06b26e835918ab7946

 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();
    
}