Merge remote-tracking branch 'origin/master'

zengh

2021-05-11 49c12cd602a111eb417f3024b9ed965bcb0f69fc

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/vo/AnimalHeatVo.java

@@ -26,5 +26,10 @@
    */
   private Integer type;

   /**
    * 时间分布状态
    */
   private String timeDesc;


}