Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-25 a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java

@@ -171,7 +171,7 @@
   

   @Override

   public UserTaoLiJinReport selectByPrimaryKey(String id) {

      return userTaoLiJinReportMapper.selectByPrimaryKey(id);

      return userTaoLiJinReportMapper.selectByPrimaryKeyStr(id);

   }

   

}