Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/java/com/izouma/nineth/service/UserService.java

@@ -348,7 +348,8 @@ public class UserService {
         }
         //如果collectionId是设定的且invitor为空
         if (collectionId != null) {
-            if (collectionId.equals((long) sysConfigService.getInt("MMC_collection_id"))) {
+            int MMC_collection_id = sysConfigService.getInt("MMC_collection_id");
+            if (collectionId.intValue() == MMC_collection_id) {
                 airDropService.create(AirDrop.builder()
                                              .name("MMC注册空投奖励空投")
                                              .remark(user.getId().toString())