Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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