From 1b6ec86cbd1dba77f665426dbcd4851ee4ea8ed8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:30:38 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index 8878f09..68827d7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -1,17 +1,13 @@
 package com.panzhihua.applets.api;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
-import com.jcraft.jsch.SftpException;
 import com.panzhihua.applets.config.MinioUtil;
 import com.panzhihua.applets.umf.UmfPayUtil;
 import com.panzhihua.common.controller.BaseController;
@@ -26,7 +22,6 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.fastjson.JSON;
 import com.panzhihua.applets.config.WxMaConfiguration;
 import com.panzhihua.common.constants.Constants;
@@ -38,7 +33,6 @@
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.utlis.HttpUtils;
 import com.panzhihua.common.utlis.SFTPUtil;
-
 import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

--
Gitblit v1.7.1