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

maven

11 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

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

@@ -22,7 +22,7 @@


    @ApiOperation("根据productId查询")
    @GetMapping("listByproductModelId/{productModelId}")
    @GetMapping("/listByproductModelId/{productModelId}")
    public R listByproductModelId( @PathVariable("productModelId") Long productModelId){
        return R.ok(productStructureService.listByproductModelId( productModelId));
    }