Merge branch 'ty_urgent' into test

wzy

2020-12-26 b026000678b45d14970bca3b8052e377072f4af2

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