冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java

@@ -67,6 +67,6 @@
    * @param dateFormat
    * @return
    */
   List<IntegralMonthVO> selectMonthMoneyByUid(@Param("uid") Long uid, @Param("dateFormat") List<String> dateFormat, @Param("type")Integer type);
   List<IntegralMonthVO> selectMonthMoneyByUid(@Param("uid") Long uid, @Param("dateFormat") List<String> dateFormat);
   
}