Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-07-29 aecf1e6808cd9eca68f5ec87340bd6c92f8c464c

 zq-erp/src/main/java/com/matrix/system/hive/service/MoneyCardUseService.java

@@ -93,11 +93,7 @@
     */
    public void transfer(MoneyCardUse moneyCardUse, Long vipId2, Double money);

    /**
     * 退款
     * jyy
     */
    public int returnMoney(MoneyCardUse moneyCardUse, Long hjkId);


    /**
     * 设置为有效