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

admin

2019-08-23 f00114371d8d379da18bc7fed3541b2575edea56

 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskClassService.java

@@ -47,5 +47,7 @@
    */

   public IntegralTaskClass getByUniqueKey(String uniqueKey);



   public IntegralTaskClass selectByPrimaryKey(Long id);





}