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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

 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