Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -1117,7 +1117,7 @@
                    title : "充值卡变更记录",
                    area : MUI.SIZE_M,
                    maxmin : true,
                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId ]
                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId + "&cardId=" + row.id ]
                });
            },