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

jyy

2021-06-23 918bfb7afa967b575a57f5880d492534c6e7de4f

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java

@@ -27,4 +27,8 @@
     * @return
     */
    List<ScoreVipDetail> selectEffectiveScore(@Param("vipId")Long vipId);

    List<ScoreVipDetail> selectInvalidaVipScore();

    int invalidVipScore();
}