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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -209,7 +209,12 @@
         IntegralTaskRecord record = integralTaskRecordMapper.selectByPrimaryKey(id);

         if (record == null)

            continue;



			
         // 已领取

         Integer state = record.getState();

         if (state != null && state == 1) 
            continue;

			
         if (addDetail(uid, record))

            totalGoldCoin += record.getGoldCoin();

      }