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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

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

   }

	
}