Revert "Merge pull request #35 from FranisiL/master_dev_lyp"

This reverts commit 60a40708b8, reversing
changes made to d96247e741.

maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java

@@ -28,7 +28,4 @@ public final class ConstantsOperateMessage {
     public static final String DELETE_SUCCESS = "message.action.delete.success";
     public static final String DELETE_ERROR = "message.action.delete.error";
 
-    public static final String import_success = "message.action.import.success";
-    public static final String IMPORT_ERROR = "message.action.import.error";
-
 }

maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java

@@ -1,19 +1,19 @@
 /*
  * Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
- *
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+ 
 
 package org.maxkey.domain;
 
@@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 /**
  * .
  * @author Crystal.Sea
- *
+ * 
  */
 @Table(name = "MXK_USERINFO")
 public class UserInfo extends JpaBaseDomain {
@@ -329,7 +329,7 @@ public class UserInfo extends JpaBaseDomain {
     }
 
     /**
-     *
+     * 
      */
     public UserInfo() {
         super();
@@ -469,7 +469,7 @@ public class UserInfo extends JpaBaseDomain {
         this.nickName = nickName;
     }
 
-
+   
 
     public String getNameZhSpell() {
         return nameZhSpell;
@@ -1147,6 +1147,7 @@ public class UserInfo extends JpaBaseDomain {
         this.description = description;
     }
 
+ 
     /**
      * @return the createdBy
      */

maxkey-core/src/main/java/org/maxkey/util/ExcelUtils.java

@@ -1,20 +0,0 @@
-package org.maxkey.util;
-
-import org.maxkey.domain.UserInfo;
-
-import java.io.InputStream;
-import java.util.List;
-
-/**
- * @author yapeng.li
- * @since 2020/9/21 21:06
- */
-public class ExcelUtils {
-
-
-    public static List<UserInfo> readExcel(InputStream in) throws Exception {
-
-
-        return null;
-    }
-}