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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserGetIntegralFromOrderRecordServiceImpl.java

@@ -37,7 +37,7 @@
      return userGetIntegralFromOrderRecordMapper.countByRecordInfo(record);

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addRecord(UserGetIntegralFromOrderRecord record) throws UserGetIntegralFromOrderRecordException {

      if (record == null || record.getUid() == null || record.getEventType() == null