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

935090232@qq.com

2021-02-20 5f377d1f45b85fba841794a93e67b03622613479

 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml

@@ -160,7 +160,7 @@
      times,
      gift_money,
      balance,
      (SELECT STAFF_NAME from sys_shopstaff_info a WHERE operation_id=a.id) staffName,
      (SELECT su_name from sys_users a WHERE operation_id=a.su_id) staffName,
      (SELECT VIP_NAME FROM sys_vip_info b WHERE vip_id=b.ID) vipName,
      (SELECT card_NAME FROM money_card_use c WHERE car_use_id=c.ID) cardName
      from money_card_use_flow