Merge remote-tracking branch 'origin/develop' into develop

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/DaHuoNumberController.java

@@ -72,6 +72,12 @@ public class DaHuoNumberController extends BaseController {
         return toAjax(daHuoNumberService.deleteDaHuoNumberByIds(daHuoNumberIds));
     }
 
+    /**
+     * 导入大货编号Excel
+     * @param file 文件对象
+     * @return 是否解析成功
+     * @throws Exception 运行错误
+     */
     @PostMapping("/importExcel")
     public R<Void> importExcel(@RequestPart("file") MultipartFile file) throws Exception {
         ExcelResult<DaHuoNumberImportVo> result = ExcelUtil.importExcel(file.getInputStream(), DaHuoNumberImportVo.class,false);