Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-24 503bc89c55d675a27b689419aa906a070ca5cb03

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -207,6 +207,7 @@
        Integer four = 1;
        Integer five = 1;
        Integer six = 1;
        Integer seven = 1;
        for (TDriverService obj : serviceList){
            if (obj.getType() == 1){
                one = 2;
@@ -226,6 +227,9 @@
            if (obj.getType() == 6){
                six = 2;
            }
            if (obj.getType() == 7){
                seven = 2;
            }
        }
        model.addAttribute("one",one);
        model.addAttribute("two",two);
@@ -233,6 +237,7 @@
        model.addAttribute("four",four);
        model.addAttribute("five",five);
        model.addAttribute("six",six);
        model.addAttribute("seven",seven);

        //查询线路列表
        List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));