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

zengh

2021-02-03 5a90071cd2797bcacc286fcad31a8b0b0875d6aa

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/controller/healthcodeController.java

@@ -147,7 +147,10 @@
      if (1 == dayWeek) {
         cal.add(Calendar.DAY_OF_MONTH, -1);
      }
      switch(type){
      String type1 = type;
      String substring = type1.substring(9, 10);
      System.out.println(substring);
      switch(substring){
         case "0" :
            //日
            String times = sdf.format(cal.getTime());