Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

Administrator

2022-05-23 b7feda7c2cc54e03966ecbd2ed2582097eb3ee73

 src/main/java/org/springblade/modules/location/entity/LiveLocation.java

@@ -38,7 +38,7 @@
    * 押运人员/车辆/枪支id
    */
   @TableField("worker_id")
   private Long workerId;
   private String workerId;


   /**