Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java

@@ -49,11 +49,13 @@
    * @return
    */
   @Override
   public Object countByType() {
   public Object countByType(PlacePractitionerVO placePractitioner) {
      // 未成年数量
      Integer minors = baseMapper.selectPlaceCountByType(CommonConstant.NUMBER_ONE);
      placePractitioner.setType(CommonConstant.NUMBER_ONE);
      Integer minors = baseMapper.selectPlaceCountByType(placePractitioner);
      // 少数民族
      Integer nationalMinority = baseMapper.selectPlaceCountByType(CommonConstant.NUMBER_TWO);
      placePractitioner.setType(CommonConstant.NUMBER_TWO);
      Integer nationalMinority = baseMapper.selectPlaceCountByType(placePractitioner);
      Map<String, Integer> resultMap = new HashMap<>();
      resultMap.put("minors",minors);
      resultMap.put("nationalMinority",nationalMinority);