Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-19 626317c580cce67668481e48e10fc4a4fb818678

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoUnionConfigMapper.java

@@ -21,4 +21,8 @@
   int updateByPrimaryKeySelective(TaoBaoUnionConfig record);

   int updateByPrimaryKey(TaoBaoUnionConfig record);
   //根据appkey查询
   TaoBaoUnionConfig selectByAppKey(String appKey);
	
	
}