Merge branch 'master' into biz-lims-dev

# Conflicts:
#	tr-test/src/main/java/cn/tr/test/WebApplication.java

tr-modules/tr-module-export/src/main/java/cn/tr/module/excel/sheet/controller/SysExportSheetController.java

@@ -28,7 +28,7 @@ public class SysExportSheetController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 1)
     @ApiOperation(value = "根据id查询导入工作簿记录表",notes = "权限： 无")
     @GetMapping("/detail/{id}")
-    public CommonResult<SysExportSheetDTO> findById(@PathVariable("id") String id){
+    public CommonResult<SysExportSheetDTO> findById(@PathVariable("id") String id) throws Exception {
         return CommonResult.success(sysExportSheetService.selectSysExportSheetById(id));
     }
 
@@ -36,7 +36,7 @@ public class SysExportSheetController extends BaseController{
     @ApiOperationSupport(author = "lf",order = 2)
     @ApiOperation(value = "取消所给id的数据导入",notes = "权限： 无")
     @GetMapping("/cancel/{id}")
-    public CommonResult<Boolean> cancel(@PathVariable("id") String id){
+    public CommonResult<Boolean> cancel(@PathVariable("id") String id) throws Exception {
         sysExportSheetService.selectSysExportSheetById(id);
         return CommonResult.success(true);
     }