Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

4 天以前 cf3482e6a4d40713cc09d107f11092c8db2e245a

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

@@ -44,7 +44,7 @@
    @ApiOperation("pda根据二维码的工单id查询数据")
    @GetMapping("/getProductWorkOrderById")
    public R getProductWorkOrderById(Long id) {
        return R.ok(productWorkOrderservice.getById(id));
        return R.ok(productWorkOrderservice.getProductWorkOrderById(id));
    }

    /**