Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

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

   }

	
}