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

yujian

2019-08-14 8e751a7ee99afce71ac615a6111228c5c785ee46

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

   }

   

}