Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

8 天以前 ca0565e53494417b3779759f8d3898e07bfd5929

 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