1、nacos dev 地址改为8848 2、行政区划支持查询第四级 3、物资管理、队伍管理查询接口修改

guoshilong

2023-06-02 9cbe73873e3b523a3eaa12051084a5f5191760ef

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/MaterialsManageController.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.materials.entity.MaterialsManage;
import cn.gistack.sm.materials.service.IMaterialsManageService;
import cn.gistack.sm.materials.vo.MaterialsManageVO;
import cn.gistack.system.user.entity.User;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -53,8 +54,9 @@
    */
   @ApiOperation(value = "应急物资管理-分页列表查询", notes = "应急物资管理-分页列表查询")
   @GetMapping(value = "/page")
   public R queryPageList(@ApiIgnore @RequestParam Map<String, Object> materialsManage, Query query) {
      IPage<MaterialsManage> pageList = materialsManageService.page(Condition.getPage(query), Condition.getQueryWrapper(materialsManage,MaterialsManage.class));
   public R queryPageList(MaterialsManageVO materialsManage, Query query) {
//      IPage<MaterialsManage> pageList = materialsManageService.page(Condition.getPage(query), Condition.getQueryWrapper(materialsManage,MaterialsManage.class));
      IPage<MaterialsManageVO> pageList = materialsManageService.selectPage(Condition.getPage(query),materialsManage);
      return R.data(pageList);
   }