Merge remote-tracking branch 'origin/master'

zengh

2021-04-09 abb5cea60f5a0c8735febd9a5cca5f768114d370

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java

@@ -49,9 +49,4 @@
    * 预警确认时间描述
    */
   private String timeDesc;

   /**
    * 预警时间分布
    */
   private Integer timeNum;
}