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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java

@@ -16,7 +16,7 @@
   
   
   TeamEincomeRecord selectByUidAndPreRecieveTimeAndTypeAndSourceType(@Param("uid") Long uid,
         @Param("preRecieveTime") Date preRecieveTime, @Param("type") int type, @Param("sourceType") int sourceType);
         @Param("preRecieveTime") Date preRecieveTime, @Param("type") int type, @Param("sourceType") Integer sourceType);