Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 56dd09a1c7405535ad5ec43a3f8b01001bb40611

 zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java

@@ -97,4 +97,6 @@

   List<DailyBeautyListVo> selectDailyBeautyList(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);
   int selectDailyBeautyListTotal(@Param("record") AchieveNew achieveNew);

   String selectPlInfoByVipIdAndDate(@Param("datatime") Date datatime, @Param("vipId") Long vipId);
}