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

yujian

2020-04-23 c3f556e2413fbb5817f3907a73c4d4d2a2521cdb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskClassServiceImpl.java

@@ -80,7 +80,7 @@
    * @param uid

    * @return

    */

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public Integer finishedDailySign(long uid) throws Exception{

      IntegralTaskClass taskClass = getByUniqueKey(UniqueKeyEnum.dailySign.name());

      if (taskClass == null || taskClass.getState() == null || taskClass.getState() != 1)