From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CompanyController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CompanyController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CompanyController.java
index eb35f55..50a4e4d 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CompanyController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CompanyController.java
@@ -19,23 +19,22 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaztt.mes.basic.entity.Company;
+import com.chinaztt.mes.basic.service.CompanyService;
 import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
 import com.chinaztt.ztt.admin.api.entity.SysDictItem;
 import com.chinaztt.ztt.admin.api.feign.RemoteDictService;
 import com.chinaztt.ztt.common.core.util.R;
 import com.chinaztt.ztt.common.log.annotation.SysLog;
-import com.chinaztt.mes.basic.entity.Company;
-import com.chinaztt.mes.basic.service.CompanyService;
 import com.chinaztt.ztt.common.security.annotation.Inner;
-import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 
@@ -228,4 +227,5 @@
 		companyService.getFile(id, response);
 	}
 
+
 }

--
Gitblit v1.9.3