From 2683793796366a4b6361baf4a16e5c65c8dce068 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java |   43 +++++++++++--------------------------------
 1 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 0a9876a..6b755bc 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -1,39 +1,18 @@
 package com.ruoyi.production.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.service.ProductionProductMainService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-@RequestMapping("productionProductMain")
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-04-21 03:55:52
+ */
 @RestController
-@Api(value = "鐢熶骇鎶ュ伐")
+@RequestMapping("/productionProductMain")
 public class ProductionProductMainController {
 
-    @Autowired
-    private ProductionProductMainService productionProductMainService;
-
-    /**
-     * 鎶ュ伐鏌ヨ
-     * @param page
-     * @param productionProductMainDto
-     * @return
-     */
-    @GetMapping("listPage")
-    public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
-        return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
-    }
-
-    /**
-     * 鎶ュ伐鏂板鏇存柊
-     * @param productionProductMainDto
-     * @return
-     */
-    @PostMapping("addProductMain")
-    public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
-        return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
-    }
 }

--
Gitblit v1.9.3