Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java

@@ -121,7 +121,9 @@
   @ApiOperation(value = "新增或修改", notes = "传入jingdan")
   public R submit(@Valid @RequestBody Jingdan jingdan) {
      //return R.status(jingdanService.saveOrUpdate(jingdan));

      if ("".equals(jingdan.getType())){
              jingdan.setType("0");
      }
      if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
         jingdan.setCzTime(null);
      }