Merge remote-tracking branch 'origin/dev-2.20.0' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/finishedGrainSupervision/modular/service/impl/DataKcglKcswDefaultCounterviceImpl.java

@@ -274,7 +274,7 @@ public class DataKcglKcswDefaultCounterviceImpl  implements DataKcglKcswDefaultC
                 queryWrapper.like("b.org_name",pageParam.getOrgName() );
             }
             if(StringUtils.isNotBlank(pageParam.getSubTypeName())){
-                queryWrapper.like("c.enumname",pageParam.getOrgName() );
+                queryWrapper.like("c.enumname",pageParam.getSubTypeName() );
             }
             Page<StorageDailycheckPageVO> p =new Page<>(pageParam.getCurrent(),pageParam.getSize());
             IPage<StorageDailycheckPageVO> page = dataKcglKcswDefaultCountMapper.findDailycheckPage(p,queryWrapper);