Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

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

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