Merge remote-tracking branch 'origin/master'

zhangherong

21 小时以前 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java

@@ -305,31 +305,6 @@
    }

    /**
     * 导出excel
     *
     * @param request
     * @param eamInspectionOrder
     */
    //@RequiresPermissions("org.jeecg.modules:点检工单:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) {
        return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "点检工单");
    }

    /**
     * 通过excel导入数据
     *
     * @param request
     * @param response
     * @return
     */
    //@RequiresPermissions("点检工单:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, EamInspectionOrder.class);
    }

    /**
     * 导出获取基本信息
     * @param equipmentCode 统一编码
     * @param inspectionDate 日期