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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

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

@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -16,9 +17,9 @@
@RequestMapping("productionProductMain")
@RestController
@Api(value = "生产报工")
@AllArgsConstructor
public class ProductionProductMainController {

    @Autowired
    private ProductionProductMainService productionProductMainService;

    /**