Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/main/java/com/glxp/api/controller/inv/DeviceAssetCertController.java

@@ -18,7 +18,6 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.inv.DeviceAssetCertService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -70,7 +69,7 @@ public class DeviceAssetCertController extends BaseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/inv/info/deleteDeviceCert")
-    public BaseResponse deleteDeviceCert(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest, BindingResult bindingResult) {
+    public BaseResponse deleteDeviceCert(@RequestBody DeleteDeviceFileRequest deleteDeviceFileRequest) {
         boolean b = deviceAssetCertService.deleteById(deleteDeviceFileRequest.getId());
         String URL = filePath + FileConstant.COMMON_FILE_PATH + deleteDeviceFileRequest.getFilePath();
         File file = new File(URL);