merge code ,fix error

pom.xml

@@ -53,6 +53,18 @@
         </dependency>
 
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.18.0</version>

src/main/java/com/cnooc/expert/common/exception/GlobalExceptionHandler.java

@@ -54,7 +54,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BusinessException.class)
     public ApiResult<String> handleBusinessException(BusinessException e, HttpServletRequest request) {
         log.error("业务异常: {}，请求URL: {}", e.getMessage(), request.getRequestURI(), e);
-        return ApiResult.error(e.getErrorCode().getCode(), e.getMessage());
+        return ApiResult.error(e.getErrorCode(), e.getMessage());
     }
 
     @ExceptionHandler(NullPointerException.class)

src/main/java/com/cnooc/expert/common/utils/JwtUtils.java

 package com.cnooc.expert.common.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.cnooc.expertmanageminiapp.common.constant.TokenConstants;
 import io.jsonwebtoken.*;
 import lombok.extern.slf4j.Slf4j;
+import com.cnooc.expert.common.constant.TokenConstants;
 
 import java.util.Date;
 import java.util.HashMap;

src/main/java/com/cnooc/expert/common/utils/UserUtils.java

 package com.cnooc.expert.common.utils;
 
-import com.cnooc.expertmanageminiapp.system.entity.pojo.ZhuanJiaUser;
+import com.cnooc.expert.system.entity.pojo.ZhuanJiaUser;
 import org.springframework.stereotype.Component;
 
 /**