Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -185,13 +185,19 @@
                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                       HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
       queryWrapper.eq("status","1");
       queryWrapper.eq("del_flag",0);
//       queryWrapper.eq("status","1");
//       queryWrapper.eq("del_flag",0);
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       return Result.OK(pageList);
    }

    @GetMapping(value = "/pageEquipment")
    public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
       IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
       return Result.OK(pageList);
    }

   /**
    *   添加
    *