fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

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