Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

5 天以前 f3a001bc44372fb669940d43b32e25ac0ddddf50

 src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java

@@ -1,7 +1,15 @@
package com.ruoyi.productionPlan.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.service.ProductionPlanService;
import com.ruoyi.staff.dto.StaffLeaveDto;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * <br>
@@ -16,4 +24,11 @@
@RestController
@RequestMapping("/productionPlan")
public class ProductionPlanController {
    @Resource
    private ProductionPlanService productionPlanService;

    @GetMapping("/listPage")
    public AjaxResult productionPlanListPage(Page page, ProductionPlanDto productionPlanDto) {
        return AjaxResult.success(productionPlanService.listPage(page, productionPlanDto));
    }
}