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

zengh

2021-01-28 d80ca95c3c0cf4b1a14f335feb13cdf30820839c

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

@@ -132,7 +132,7 @@
    * 统计接口
    */
   @PostMapping("/selectCount")
   public R selectCount(String type, HttpServletResponse response) {
   public R selectCount(@RequestBody String type, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
@@ -189,6 +189,7 @@

      return R.data(list);
   }

   private static Date getMonthStart(Date date) {

      Calendar calendar = Calendar.getInstance();