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

935090232@qq.com

2021-03-14 b0ee5ab18f8242d0ca81966c07db00e0c6274831

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


    /**
     * 设置为有效