Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java

@@ -19,7 +19,7 @@ public class ImportExcelUtil {
 
     }
 
-    public static Result imporReturnRes(int errorLines, int successLines, List<String> errorMessage){
+    public static Result<JSONObject> imporReturnRes(int errorLines, int successLines, List<String> errorMessage){
         if (errorLines == 0) {
             return Result.OK("共" + successLines + "行数据全部导入成功！");
         } else {

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ReflectHelper.java

@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 @Slf4j
 public class ReflectHelper {
 
-    private Class cls;
+    private Class<?> cls;
 
     /**
      * 传过来的对象

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/sign/util/HttpUtils.java

@@ -108,7 +108,7 @@ public class HttpUtils {
      * @param request
      * @return
      */
-    public static Map getAllRequestParam(final HttpServletRequest request) throws IOException {
+    public static Map<String,String> getAllRequestParam(final HttpServletRequest request) throws IOException {
 
         BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream()));
         String str;