Merge remote-tracking branch 'origin/jtdev' into jtdev

gonglilong

2024-09-14 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/impl/MaterialsManageServiceImpl.java

@@ -18,6 +18,6 @@
public class MaterialsManageServiceImpl extends BaseServiceImpl<MaterialsManageMapper, MaterialsManage> implements IMaterialsManageService {
   @Override
   public IPage<MaterialsManageVO> selectPage(IPage<MaterialsManageVO> page, MaterialsManageVO materialsManage) {
      return page.setRecords(baseMapper.selectMyPage(materialsManage));
      return page.setRecords(baseMapper.selectMyPage(page,materialsManage));
   }
}