Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java

@@ -269,8 +269,8 @@
                        try {
                            if(allOpeOrder != null && allOpeOrder.size() > 0)
                            {
                               int count = allOpeOrder.size();
                               this.setRowCount(count);
//                               int count = allOpeOrder.size();
                               this.setRowCount(supplierOpeOrderService.SupplierOpeOrderTotal(orderCode,applyCode,status,orderTime,orderEndTime));

                               list = supplierOpeOrderService.getSupplierOpeOrderList(orderCode,applyCode,status,orderTime,orderEndTime,first,pageSize);
                               for (int i=0;i<list.size();i++) {