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

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/ForbiddenUserIdentifyCodeMapper.java

@@ -19,5 +19,5 @@
    */
   List<ForbiddenUserIdentifyCode> listByTypeAndIdentifyCode(@Param("type") ForbiddenUserIdentifyCodeTypeEnum type,
         @Param("identifyCode") String identifyCode);

	
}