Merge pull request 'm' (#24) from yanyang into master

Reviewed-on: #24

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -342,7 +342,7 @@ public class WoPackagingBoxSubstrateController {
             @ApiImplicitParam(name = "woSubstrateId", value = "基板ID（关联T_SUBSTRATE表）", paramType = "query", dataTypeClass = String.class)
 
     })
-            public List<WoPackagingBoxSubstrateDTO> substrateList(@ApiIgnore @RequestParam Map<String, Object> params){
+    public List<WoPackagingBoxSubstrateDTO> substrateList(@ApiIgnore @RequestParam Map<String, Object> params){
         return woPackagingBoxSubstrateService.substrateList(params);
     }
 
@@ -358,7 +358,7 @@ public class WoPackagingBoxSubstrateController {
 
     })
     public void exportPackingInfo(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<WoPackagingBoxSubstrateDTO> list = woPackagingBoxSubstrateService.list(params);
+        List<WoPackagingBoxSubstrateDTO> list = woPackagingBoxSubstrateService.substrateList(params);
         if(list.size()>0) {
             ExcelUtils.exportExcelToTarget(response, "装箱单信息", list, WoPackagingBoxSubstrateExcel.class);
         }