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

admin

2019-07-25 09476adf2ae2bcc2f6685dafe4707938fd82bc78

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

@@ -169,4 +169,9 @@
      }

   }

   

   @Override

   public UserTaoLiJinReport selectByPrimaryKey(String id) {

      return userTaoLiJinReportMapper.selectByPrimaryKeyStr(id);

   }

	
}