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

maven

22 小时以前 d9ff3817f056ad245a16bd394133a407d6c6b9cf

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

@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

@RequestMapping("productionProductMain")
@RestController