Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2023-12-21 3cbdeaa5e8983ea5071ea446813ef5215b9822a0

 springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java

@@ -24,7 +24,7 @@
@GetMapping("/all2")
    public void selectdd(String orderid){
       SpianService service=new SpianService();
       service.selectout(orderid);
       service.selectout2(orderid);
    
}

@@ -33,7 +33,7 @@
   //按订单优先进片
    public void selectAll(Short glassid){
       SpianService service=new SpianService();
       service.selectAll(glassid);
       service.selectAll(Short.toString(glassid));
      
    }