Merge remote-tracking branch 'origin/master'

Houjie

2025-05-26 1ae9b57657199f46affc9083c39681f1ec934e3f

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java

@@ -13,6 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.InStoreDetail;
import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.service.IInStoreDetailService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,19 +57,17 @@
    * @param inStoreDetail
    * @param pageNo
    * @param pageSize
    * @param req
    * @param query
    * @return
    */
   //@AutoLog(value = "入库明细-分页列表查询")
   @ApiOperation(value="入库明细-分页列表查询", notes="入库明细-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<InStoreDetail>> queryPageList(InStoreDetail inStoreDetail,
   public Result<?> findPageList(InStoreDetail inStoreDetail,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<InStoreDetail> queryWrapper = QueryGenerator.initQueryWrapper(inStoreDetail, req.getParameterMap());
      Page<InStoreDetail> page = new Page<InStoreDetail>(pageNo, pageSize);
      IPage<InStoreDetail> pageList = inStoreDetailService.page(page, queryWrapper);
                           @RequestParam Map<String, String> query) {
      IPage<Map<String, Object>> pageList = inStoreDetailService.findPageList(pageNo, pageSize, query);
      return Result.OK(pageList);
   }