Merge branch 'api' into hive2.0

jyy

2021-03-08 acc6c0773bc959be6aa8cf6b9e767593a2d066f4

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