Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -310,6 +310,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("请填写注册时间早于自己的用户邀请码!");
         }
 
+        //4、判断用户推荐人邀请码是否为自己的邀请码
+        if (user.getUserId().equals(userCode.getUserId())) {
+            return R.error("推荐人不能是自己!");
+        }
+
         //4、设置用户被邀请码
         user.setBeInvitedCode(inviteCode);
         int count = usersMapper.edit(user);

wisenergy-web-admin/src/main/java/cn/wisenergy/Application.java

 package cn.wisenergy;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;