Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseFlowDao.java

@@ -33,5 +33,7 @@
   public int  selectTotalRecord(@Param("record") MoneyCardUseFlow moneyCardUseFlow);
   
   public MoneyCardUseFlow  selectById(Long id);

   int updateVipCardId(@Param("vipId") Long vipId, @Param("cardId") Long cardId);
   
}