Merge branch 'api' into score_shop

Helius

2021-04-08 4eda876fabd7478e337041d7b9c7db771678fac5

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