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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -88,7 +88,7 @@
         codePublishRecord.setTeam(firstTeam + secondTeam);

         if (user != null && user.getType() == 1) {// 假用户

            long s = Integer

                  .parseInt((206 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 82) + "");

                  .parseInt((180 * (6365705L - codePublishRecord.getUid()) / (6365705L - 6315822L) + 20) + "");

            codePublishRecord.setTeam(s + codePublishRecord.getTeam());

         }

      }