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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

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