Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-02-11 28c2126249a35ded0b816a07d80c015caa45a4f3

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -335,6 +335,7 @@
        Map<String,String> sortDate = (Map<String, String>) config.get("sort");
        String field = sortDate.get("field").replaceAll("(?<!^)([A-Z])", "_$1").toLowerCase();
        String orderBy = sortDate.get("order");
        System.out.println(field+"  "+orderBy);

        Map<String,Object> map = new HashMap<>();
        map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType, field, orderBy));