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

liyong

昨天 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

 src/main/java/com/ruoyi/production/controller/ProductStructureController.java

@@ -34,7 +34,7 @@

    @ApiOperation("BOM查看子集详情")
    @GetMapping("/listBybomId/{bomId}")
    public R listBybomId( @PathVariable("bomId") Long bomId){
    public R listBybomId( @PathVariable("bomId") Integer bomId){
        return R.ok(productStructureService.listBybomId(bomId));
    }
}