Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java

@@ -75,10 +75,6 @@
    */
   @Override
   public IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO) {
      //判断城市
      if(null != healthcodeVO.getProvince()){
         //根据拿到的省id 查询出城市名称
      }
      return page.setRecords(baseMapper.selectHealthcodeListPage(page,healthcodeVO));
   }
}