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

admin

2020-05-13 60a099a7edfd81a3b10c766e113c019cdef6cd3d

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsRecordServiceImpl.java

@@ -31,7 +31,7 @@
      TeamDividentsRecord old = teamDividentsRecordMapper.selectByUidAndDayForUpdate(record.getUid(),

            record.getDay());

      if (old != null)

         throw new TeamDividentsRecordException(1, "记录已存在");

         throw new TeamDividentsRecordException(TeamDividentsRecordException.CODE_EXIST, "记录已存在");

      // 加入记录



      if (record.getCreateTime() == null)