Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

 src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java

@@ -100,5 +100,11 @@
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date endTime;

   /**
    * 保安服务类型
    */
   @TableField("serve_type")
   private String serveType;


}