Merge branch 'ty_fix' into score_shop

Helius

2021-11-12 9a58083d31ee7795bef2c3708ffeecc8d4848c75

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