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

liyong

6 天以前 fe82da7485601580104c058f382405cc0cc9e043

 src/main/java/com/ruoyi/stock/controller/StockInRecordController.java

@@ -16,13 +16,13 @@
import java.util.List;

@RestController
@Api(tags = "采购入库")
@Api(tags = "入库")
@RequestMapping("/stockInRecord")
public class StockInRecordController {
    @Autowired
    private StockInRecordService stockInRecordService;

    @GetMapping("/listPageByProduction")
    @GetMapping("/listPage")
    @Log(title = "生产入库-入库管理-列表", businessType = BusinessType.OTHER)
    @ApiOperation(value = "入库管理列表")
    public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {